Merge "Add support for proguard deobfuscation."