Merge "Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40 am: 238be4a67b" into oc-dr1-dev-plus-aosp
am: 319a28880e

Change-Id: I082d52f29c824dc6534f73ab073b520091057a2c