Merge "Reference nativehelper/jni.h as jni.h"
am: 7e68d0e9aa

Change-Id: I4e7a2b313090fe5ff90d9893f10ae9dc53d9da80