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