Merge changes from topic "NNAPI v1.3" am: b4ff6258c9 am: ed0f3469ce
am: e601f0d3e4

Change-Id: I8a8a1a4dbf8ece7e5a01179054eb39a438b070d7