Revert of Address some TODO(GYP_GONE)s

testing/buildbot/chromium.android.json

Index: testing/buildbot/chromium.android.json
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 717223aab647ae4296294d967e784f0286862584..5881722aeff3d2523dbd5d5e51900d0d9668b4bb 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -1295,6 +1295,9 @@
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
@@ -1349,6 +1352,9 @@
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -1457,6 +1463,9 @@
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "override_isolate_target": "breakpad_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2051,6 +2060,9 @@
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "override_isolate_target": "sandbox_linux_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2509,6 +2521,9 @@
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
@@ -2560,6 +2575,9 @@
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {
@@ -3984,6 +4002,9 @@
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
@@ -4035,6 +4056,9 @@
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {