Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."