[Android] Begin switching from lighttpd + apache to 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 960c61bd70f2847e2d076d18b56396fe6127121d..4010d66a1b576480e55d332a520babc867c37382 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1469,6 +1469,12 @@ 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
+    }
   }
 
   _android_manifest_deps = []
@@ -1540,7 +1546,7 @@ template("android_apk") {
     java_cpp_template("${_template_name}__native_libraries_java") {
       package_name = "org/chromium/base/library_loader"
       sources = [
-        "//base/android/java/templates/NativeLibraries.template",
+        _native_libraries_template,
       ]
       inputs = [
         _build_config,
@@ -1880,6 +1886,7 @@ template("instrumentation_test_apk") {
       data_deps += invoker.data_deps
     }
     deps = [
+      "//base:base_java",
       "//testing/android/broker:broker_java",
     ]
     if (defined(invoker.deps)) {
@@ -1899,6 +1906,8 @@ template("instrumentation_test_apk") {
     }
     if (defined(invoker.native_libs)) {
       native_libs = invoker.native_libs
+      native_libraries_template =
+          "//base/android/java/templates/NativeTestLibraries.template"
     }
     if (defined(invoker.apk_under_test)) {
       apk_under_test = invoker.apk_under_test