Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated." am: 077678590f am: 88c21d596a am: b27eb63a3b
am: ef04af36bc

Change-Id: Ia71224739691a7edac4fdb871b264f317c3728d0