Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp"
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>
Wed, 10 Oct 2018 13:36:56 +0000 (06:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Oct 2018 13:36:56 +0000 (06:36 -0700)
am: f59720c6b8

Change-Id: I636b34bce6c154c72f1eb732a23d8473b17f7efd


Trivial merge