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

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

Change-Id: Id90999e2ebafeef9a08b4efba7dc2b7adfe535c7