Merge "AAPT2: Add round qualifer support"