Migrate NNAPI to canonical types

Bug: 160669906
Test: m
Change-Id: Ib5282e5477e7c632485a966b2fef02044ce9fb96
Merged-In: Ib5282e5477e7c632485a966b2fef02044ce9fb96
(cherry picked from commit 8230f8c6f2c7e7afac7b1312bb40bc820d5b465a)
3 files changed