Merge \"Merge \\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\" into nyc-dev am: 757f4ef340 am: e05a4d0d19\" into nyc-mr1-dev-plus-aosp
am: 98d3330087

Change-Id: Ie87af7c36cf1fa5def0dea3d4583a670c48610e4