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

Change-Id: Ibe607d46226797ff4d419dcb18d6cfb3388b4c5c