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

Change-Id: I09cf9fa8fc080ec486d801fb143e5782e16f4fc4