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