am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary...
am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '8709497e':
Revert "Collect and store proguard obfuscation dictionary files."