Merge "Revert "Specify test dependecies in rules.gradle.""