Merge "Migrate NNAPI to canonical types" am: c21732465b

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

Change-Id: I997608d4ff3c572b125348d69b9c7543e1fb6bbd