am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local...
am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa0':
Revert "use utf8_length() instead of local function, isValidUtf8()"