Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated." am: 07767859 am: 88c21d59 Change-Id: Ibe607d46226797ff4d419dcb18d6cfb3388b4c5c