am 92ed0994: am c3e977ac: am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev

* commit '92ed0994d94db0f52815841669707ad0ed8a2257':
  Revert "Collect and store proguard obfuscation dictionary files."