Merge "Remove non-NDK headers from the NDK." am: d7bb61285f am: 339113ac6f am: 09cfcb8f77

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

Change-Id: I4c8b703ed1709fbd2d1e3d02c00d1befdbb1038b