Merge "AAPT2: Iterate over UTF-8 string by codepoints"