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

Change-Id: I3a8e91baab4b7e24bd75a24bc1658692972d2cda