Merge "Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43ded am:...

Merge "Fix integer overflow in utf{16,32}_to_utf8_length am: f0a43ded am: 33abf909 am: 789673b1 am: 14369278 am: d70e582d am: 62d5a78d am: 5b37a8ce am: 16e2001f am: e2b5839d  -s ours am: 84bdda1e  -s ours am: 94222586  -s ours am: f6397586  -s ours" into oc-mr1-dev-plus-aosp
am: 581b41aa  -s ours

Change-Id: Icd5b4c3d4d9a8ca8926dd7f570075bded96893ca