Merge "AAPT2: Adaptive icon refactor"