fix confusion between characters, code points and code units

Change-Id: I315735e103799ff2fb53e99442d500b998f50304