Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258

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

Change-Id: I23b611db1d096074381d0b5c93bad0df18e0a8c9