Merge "Revert "AAPT2: Auto-version adaptive-icon XML""