Merge "Add bound checks to utf16_to_utf8"
am: b990030f42

Change-Id: I58b0b91764d5313fef86a0ab2f99f6324711b22f