DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 2806397d1e am: 8c9d02551c am: 28f28ce635  -s ours am: f611765aaf am: 207717bde6 am: dc5a96f5b3 am: 1aad4b61cb  -s ours am: 8170f506f7 am: 385b34e776
am: cadf913d66  -s ours

Change-Id: I5208677642cae3277b988ce6f4295b6be2c47379