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

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

Change-Id: Ieb360bbd9e5e1b129a8e72567d59e98947a26a4a