Merge "Remove unnecessary NNAPI header files"