Merge "Move NNAPI type information to types.spec" am: a23a3613bc am: 0018455816

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

Change-Id: Ic974bd945f2516a018d45d4d63b13b5d211c8347