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

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

Change-Id: I2838fd46717353f2ea2fc7b578baa88330728894