Android: Instrumentation tests in gradle

build/android/gradle/dependencies.jinja

 {# Copyright 2016 The Chromium Authors. All rights reserved. #}
 {# Use of this source code is governed by a BSD-style license that can be #}
 {# found in the LICENSE file. #}
+{% macro expand_deps(variables, prefix) %}
+{% if variables is defined %}
+{% for path in variables.prebuilts %}
+    {{ prefix }} files("{{ path }}")
+{% endfor %}
+{% for proj in variables.java_project_deps %}
+    {{ prefix }} project(":{{ proj }}")
+{% endfor %}
+{% for proj in variables.android_project_deps %}
+    {{ prefix }} project(path: ":{{ proj }}", configuration: "debug")
+{% endfor %}
+{% endif %}
+{% endmacro %}
+
 dependencies {
-{% for path in prebuilts %}
-    {{ depCompileName }} files("{{ path }}")
-{% endfor %}
-{% for proj in java_project_deps %}
-    {{ depCompileName }} project(":{{ proj }}")
-{% endfor %}
-{% for proj in android_project_deps %}
-    {{ depCompileName }} project(path: ":{{ proj }}", configuration: "debug")
-{% endfor %}
+{{ expand_deps(main, 'compile') }}
+{{ expand_deps(test, 'testCompile') }}
+{{ expand_deps(android_test, 'androidTestCompile') }}
 }