[automerger skipped] Define NNAPI Extensions types am: bbcdc42abb am: fbddd27c3a
am: b4c3f2e660 -s ours
am skip reason: change_id Ia9b99015eec7a48bbf969cbe503862271f09adca with SHA1 9212018558 is in history

Change-Id: I8b8357f483d4d9ded21379d75144a5a76d4892f8