Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files."