Merge "Update default proguard.cfg file"