am 2068778a: am b4d7d295: Merge "Revert "Specify test dependecies in rules.gradle.""

* commit '2068778aef79c74b9c2cc92b29de6b0e7ff2688d':
  Revert "Specify test dependecies in rules.gradle."