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

Change-Id: I846e221d227205bc829ba769fa2a0515ec3e4819