Merge "Remove proguard rules that are imported via aapt2"