Merge changes from topic "NNAPI v1.3" am: b8d9568f3d
am: 5af04da4a0

Change-Id: I071d26d9a6530e6645b99503d7155a87a1f00378