Merge "Rebuild proguard.jar with ant/gradle support."