Merge "Remove non-NDK headers from the NDK." am: d7bb61285f

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

Change-Id: Iaa76f21905ebdb335f8745719398470d5ab9dbcb