Merge "Remove unnecessary NNAPI header files" am: 9ec39aa042

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

Change-Id: If78e4f30333afd2dd6b000abad14413bc9027969