Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev