Merge "Add bound checks to utf16_to_utf8 am: 9b39ebe132 am: 856a04b27e" into nyc-mr1-dev-plus-aosp