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

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

Change-Id: I09278fbff1e63e0bd290f326e097e7e1f3a31a2b