[automerger skipped] Merge changes from topic "NNAPI v1.3" am: b8d9568f3d am: 5af04da4a0 am: b339abc82c
am: b4b2ca81c5 -s ours
am skip reason: SHA1 b4b2ca81c5 skipped by user levp

Change-Id: I28f74e4b364fec1d7431a96cf5687256b3106069