Merge "Tools package was missing proguard.bat"