Merge "Fix proguard flags"