Merge "Use jni_headers instead of JNI_H_INCLUDE"