Merge "Tweak proguard flags in the 2 files."