Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a am: b90a8a87d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482

Change-Id: Ieaf44ea19965b4c0ba9fef0cc2dfe9844ba0b3a2