[Cronet] Make Cronet buildable on regular Android bots.

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index e9e673767ee630a05d7e9bf9148b63e1c88644cd..470e1b53f1959e81547b0076cb785f7c9edbb4d5 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -89,12 +89,10 @@ component("net") {
   deps = [
     ":net_resources",
     "//base",
-    "//base:i18n",
     "//base:prefs",
     "//base/third_party/dynamic_annotations",
     "//net/base/registry_controlled_domains",
     "//sdch",
-    "//third_party/icu",
     "//third_party/zlib",
     "//url",
   ]
@@ -512,19 +510,20 @@ component("net") {
   }
 
   if (use_icu_alternatives_on_android) {
-    deps -= [
+    sources += [
+      "base/net_string_util_icu_alternatives_android.cc",
+      "base/net_string_util_icu_alternatives_android.h",
+    ]
+  } else {
+    deps += [
       "//base:i18n",
       "//third_party/icu",
     ]
-    sources -= [
+    sources += [
       "base/filename_util_icu.cc",
       "base/net_string_util_icu.cc",
       "base/net_util_icu.cc",
     ]
-    sources += [
-      "base/net_string_util_icu_alternatives_android.cc",
-      "base/net_string_util_icu_alternatives_android.h",
-    ]
   }
 }
 
@@ -950,6 +949,7 @@ if (!is_ios && !is_android) {
     deps = [
       ":net",  # TODO(brettw) bug 363749: this shouldn't be necessary. It's not
                # in the GYP build, and can be removed when the bug is fixed.
+
       ":test_support",
       "//base",
       "//base/test:test_support",
@@ -991,8 +991,8 @@ if (is_linux) {
   static_library("epoll_server") {
     sources = [
       "tools/epoll_server/epoll_server.cc",
-      "tools/epoll_server/linux_epoll_server.cc",
       "tools/epoll_server/epoll_server.h",
+      "tools/epoll_server/linux_epoll_server.cc",
     ]
     deps = [
       ":net",