Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add...

Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542 am: d0ad14ca am: 3841c929  -s ours am: 247ac63c  -s ours am: 6179f1a5 am: 451f4b3d am: 3c85e4e5  -s ours am: baac6666 am: 2858362f am: 7a0c6bf5 am: f9627118  -s ours am: 53d529a5 am: deb0b40f" into nyc-mr1-dev-plus-aosp