Merge "Remove JNI_H_INCLUDE from make." am: cc96704ad2 am: 2d05df376d
am: f88b6bd7d8

Change-Id: Idd3421a6e4c23186fe689f57bd252a7276b84799