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

Change-Id: I569f7cc0866b622f0e5e01999a2325c925db87a5