Revert \\\\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5  -s ours am: 01799f4381 am: 36a57066f1
am: 6087eb147b

Change-Id: I68f3b3cb80c131233c0f77385d07bc323c7ff552