Merge "Rename r8 to r8-compat-proguard"