Merge "AAPT2: Change proto format to reduce usage of StringPool"