Merge "ndk: update JNIEXPORT declaration in <jni.h>"