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