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

Change-Id: I66c2b632511ad5b6d2ce971ef4640e6c95c7c7b7