Revert of Address some TODO(GYP_GONE)s

testing/buildbot/chromium.android.json

 {
   "Android Cronet Builder": {
     "additional_compile_targets": [
       "cronet_package"
     ]
   },
   "Android N5X Swarm Builder": {
     "gtest_tests": [
       {
         "override_compile_targets": [
@@ skipping 1277 matching lines @@
   },
   "KitKat Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
       },
       {
         "test": "components_browsertests"
@@ skipping 34 matching lines @@
       {
         "test": "latency_unittests"
       },
       {
         "test": "media_unittests"
       },
       {
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {
         "test": "sql_unittests"
       },
       {
         "test": "storage_unittests"
       },
       {
         "test": "ui_android_unittests"
@@ skipping 88 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "override_isolate_target": "breakpad_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
             }
           ],
@@ skipping 574 matching lines @@
                 "=android%2Fswarming%2Flogcats%2F",
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "override_isolate_target": "sandbox_linux_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
             {
               "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
               "location": "bin",
               "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
             }
           ],
@@ skipping 438 matching lines @@
   },
   "Lollipop Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
       },
       {
         "test": "components_browsertests"
@@ skipping 31 matching lines @@
       {
         "test": "ipc_tests"
       },
       {
         "test": "media_unittests"
       },
       {
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {
         "test": "sql_unittests"
       },
       {
         "test": "storage_unittests"
       },
       {
         "test": "ui_android_unittests"
@@ skipping 1404 matching lines @@
   },
   "Marshmallow Tablet Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
+        "override_compile_targets": [
+          "breakpad_unittests_deps"
+        ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
       },
       {
         "test": "components_browsertests"
@@ skipping 31 matching lines @@
       {
         "test": "ipc_tests"
       },
       {
         "test": "media_unittests"
       },
       {
         "test": "net_unittests"
       },
       {
+        "override_compile_targets": [
+          "sandbox_linux_unittests_deps"
+        ],
         "test": "sandbox_linux_unittests"
       },
       {
         "test": "sql_unittests"
       },
       {
         "test": "storage_unittests"
       },
       {
         "test": "ui_android_unittests"
@@ skipping 20 matching lines @@
       },
       {
         "test": "chrome_sync_shell_test_apk"
       },
       {
         "test": "content_shell_test_apk"
       }
     ]
   }
 }