Merge "Revert "Remove non-NDK headers from the NDK."" am: 3bd6a65cf7 am: ba115edb76

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1987151

Change-Id: I2a56eccc9c1684eee5c5a4a610c3e84fcd2c5b7b