Merge "Remove JNI_H_INCLUDE from make."