[Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index e65607045caf93c1c238dda2cd3d80c8f40de0c6..fcd3a1d966e2193fbd802e8c79708931cb45b9d3 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1347,6 +1347,17 @@ template("android_apk") {
     if (defined(invoker.native_lib_version_arg)) {
       _native_lib_version_arg = invoker.native_lib_version_arg
     }
+
+    _native_libraries_template =
+        "//base/android/java/templates/NativeLibraries.template"
+    if (defined(invoker.native_libraries_template)) {
+      _native_libraries_template = invoker.native_libraries_template
+    }
+
+    _native_libraries_package_name = "org/chromium/base/library_loader"
+    if (defined(invoker.native_libraries_package_name)) {
+      _native_libraries_package_name = invoker.native_libraries_package_name
+    }
   }
 
   _android_manifest_deps = []
@@ -1432,9 +1443,9 @@ template("android_apk") {
     }
 
     java_cpp_template("${_template_name}__native_libraries_java") {
-      package_name = "org/chromium/base/library_loader"
+      package_name = _native_libraries_package_name
       sources = [
-        "//base/android/java/templates/NativeLibraries.template",
+        _native_libraries_template,
       ]
       inputs = [
         _build_config,
@@ -1869,12 +1880,16 @@ template("instrumentation_test_apk") {
     deps = []
     data_deps = []
     forward_variables_from(invoker, "*")
-    deps += [ "//testing/android/broker:broker_java" ]
+    deps += [
+      "//base:base_java",

[agrieve, 2015/11/24 16:27:14]

Shouldn't be necessary?

[jbudorick, 2015/11/24 18:19:28]

nope, removed

+      "//testing/android/broker:broker_java",
+    ]
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
+
     run_findbugs = false
   }