am 90aeba65: (-s ours) am 8097dda9: Merge "Specify test dependecies in rules.gradle."

* commit '90aeba65f03978448cd3e7615b4dae96ac6dcddc':