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

Change-Id: I56e293d16dee7503f717f3cca4902720307a2024