Merge "Add an ndk_headers module for jni.h."