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

Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163