Merge "Remove use of deprecated utf8ToCodepoint in ApiFormatXml."