Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40
am: 238be4a67b

Change-Id: Icb75bc6c2ba9750349de0e4f0ea15c29b5502b7b