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