Merge "AAPT2: Add support for clearer in-progress public attributes"