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

Change-Id: Ib0c49f4af0d83830b0b568b68efc8df17a94a7a1