Merge "Move proguard before classes.jar"