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

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

Change-Id: Ic5e925237786260eca1890de6f23e252c12454a2