Merge "Fix incorrect syntax in Proguard flags"