tree ce292a8be2ec17772be6b6c2cd72d49d5a2941ac
parent dc607bc28e12ce8655a237a18949302951db9c02
parent 1191f516fe733443bff101b2f1b0ca5048751f4a
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 1540231283 -0700
committer android-build-merger <android-build-merger@google.com> 1540231283 -0700

Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp2"
am: 1191f516fe

Change-Id: I33dca6e35522eaac2acbe44ea6adea61f0998822