Merge changes from topic "cp_nnapi"
am: 7df64ea2fd

Change-Id: I8028dc7c900d7b4187eb8a50f98ad71723ccd310