Android O IOT Preview 5 (OIR1.170720.015)
Merge "Reference nativehelper/jni.h as jni.h"