Merge "Reference nativehelper/jni.h as jni.h" am: 28c9177f66 am: 6ac4d2a42b am: 9cd659c8dc
am: 7ec584b142

Change-Id: Id80fe1c03e327153a8ecb73cb9953f43b3ed8cfb