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

Change-Id: I7b80bbe5eed3066edfe26d83dd322114d2e4a961