Merge "AAPT2: Increase maximum proto size"