Merge \\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\" into lmp-dev am: 8d2d6cedbb  -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef  -s ours am: 72bad95df5
am: ae21a25383

Change-Id: I3c2f28c59c588a2cce0a00e33914181ac0d876ef