Merge "Reference nativehelper/jni.h as jni.h"
am: 899a1f23c5

Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62