Merge "Remove unnecessary NNAPI header files" am: 9ec39aa042 am: 340e03f4b9 am: 970d671c9b am: b40584fd8e

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

Change-Id: I38e03a9c288afff981364be8a2a5462252094162