Merge changes from topic 'nnapi_hal_move' into oc-mr1-dev am: 9154eae534
am: aa956d8f19

Change-Id: I78b00e39af9c92b0dd39b2abca09b78f5ac218a0