Android o preview 4
Merge "Reference nativehelper/jni.h as jni.h"