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

Change-Id: I789b1f2d74b79b8479bc6b389b2dab2ca5104c74