Merge "Remove redundant rules from proguard_common.flags" into main