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

Change-Id: I399f85bd975bda5eabc188a527afd7c35608d8f3