Merge "Reference nativehelper/jni.h as jni.h"