Updated ant build for chain proguard obfuscation
Fixed conflicts after merge