Merge "Only define proguard dictionary as output if obfuscating"