Merge "AAPT: Version <adaptive-icon> to v26"