Merge "Remove unnecessary proguard flags"