Merge "Migrate NNAPI to canonical types" am: c21732465b am: bc55f56d18 am: d61f263d69

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1484120

Change-Id: I6d11145a532a990f80a4e95f076f441488617e07