Merge "Reference nativehelper/jni.h as jni.h"
am: 28c9177f66

Change-Id: If460edb57fbd4678cfe932eb76b0931024f17f80