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

Change-Id: Icc30767adea1ce61fe3bd87b395268db674ce021