Merge "AAPT2: Convert from Modified UTF-8 ResStringPool"