Merge "Fix integer overflow in utf{16,32}_to_utf8_length am: 47efc676c8 am: 6e2bf89dc7 am: 571cf65594" into oc-mr1-dev-plus-aosp
am: 36aa6f77a8

Change-Id: I92f34920e17dcf0857d43251aeaa77a70a996847