Merge "Add support for proguard deobfuscation."
am: dfe3ce6eda

Change-Id: I9cca0af365730619a4d2e2f51bcd7c84ae7519ab