[Android] Begin switching from lighttpd + apache to EmbeddedTestServer.

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 769e2b77afa3dfdabf267bf70d27b4fc89ea0eb0..842a1006ddad3ba416630b6308f85767a4558d84 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -671,11 +671,7 @@ source_set("test_support") {
     "test/spawned_test_server/local_test_server.h",
     "test/spawned_test_server/local_test_server_posix.cc",
     "test/spawned_test_server/local_test_server_win.cc",
-    "test/spawned_test_server/remote_test_server.cc",
-    "test/spawned_test_server/remote_test_server.h",
     "test/spawned_test_server/spawned_test_server.h",
-    "test/spawned_test_server/spawner_communicator.cc",
-    "test/spawned_test_server/spawner_communicator.h",
     "test/url_request/url_request_failed_job.cc",
     "test/url_request/url_request_failed_job.h",
     "test/url_request/url_request_mock_data_job.cc",
@@ -710,8 +706,13 @@ source_set("test_support") {
     public_deps += [ "//crypto:platform" ]
   }
 
-  if (!is_android) {
-    sources -= [
+  if (is_android) {
+    public_deps += [ ":net_test_jni_headers" ]
+    sources += [
+      "test/android/net_test_jni_onload.cc",
+      "test/android/net_test_jni_onload.h",
+      "test/embedded_test_server/android/embedded_test_server_android.cc",
+      "test/embedded_test_server/android/embedded_test_server_android.h",
       "test/spawned_test_server/remote_test_server.cc",
       "test/spawned_test_server/remote_test_server.h",
       "test/spawned_test_server/spawner_communicator.cc",
@@ -1226,8 +1227,9 @@ if (is_android) {
     sources = [
       "android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java",
       "test/android/javatests/src/org/chromium/net/test/DummySpnegoAuthenticator.java",
+      "test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java",
     ]
-    jni_package = "net"
+    jni_package = "net/test"
   }
 }