Merge "Cherry-pick: Fix the incompatible type of UChar and char16_t"
am: 7cf4c5547e

Change-Id: If25eb82b773768c31fc7eb7ec2cacc6192500d09