Merge "Fix bug where aapt2 optimize obfuscated color-* resources"