Address some TODO(GYP_GONE)s

testing/buildbot/chromium.android.fyi.json

 {
   "Android Tests (trial)(dbg)": {
     "gtest_tests": [
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "blink_heap_unittests"
       },
       {
@@ skipping 13 matching lines @@
   "Jelly Bean Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
         "override_compile_targets": [
-          "breakpad_unittests_deps"
+          "breakpad_unittests"
         ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
       },
       {
@@ skipping 36 matching lines @@
         "test": "latency_unittests"
       },
       {
         "test": "media_unittests"
       },
       {
         "test": "net_unittests"
       },
       {
         "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
+          "sandbox_linux_unittests"
         ],
         "test": "sandbox_linux_unittests"
       },
       {
         "test": "sql_unittests"
       },
       {
         "test": "storage_unittests"
       },
       {
@@ skipping 24 matching lines @@
   "Lollipop Consumer Tester": {
     "gtest_tests": [
       {
         "test": "android_webview_unittests"
       },
       {
         "test": "base_unittests"
       },
       {
         "override_compile_targets": [
-          "breakpad_unittests_deps"
+          "breakpad_unittests"
         ],
         "test": "breakpad_unittests"
       },
       {
         "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
       },
       {
@@ skipping 36 matching lines @@
         "test": "latency_unittests"
       },
       {
         "test": "media_unittests"
       },
       {
         "test": "net_unittests"
       },
       {
         "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
+          "sandbox_linux_unittests"
         ],
         "test": "sandbox_linux_unittests"
       },
       {
         "test": "sql_unittests"
       },
       {
         "test": "storage_unittests"
       },
       {
@@ skipping 638 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "base_unittests"
       },
       {
         "override_compile_targets": [
-          "breakpad_unittests_deps"
+          "breakpad_unittests"
         ],
         "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 651 matching lines @@
                 "${TASK_ID}%2F%2B%2Funified_logcats"
               ],
               "name": "shard #${SHARD_INDEX} logcats"
             }
           ]
         },
         "test": "net_unittests"
       },
       {
         "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
+          "sandbox_linux_unittests"
         ],
         "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 262 matching lines @@
         "test": "android_webview_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "base_unittests"
       },
       {
         "override_compile_targets": [
-          "breakpad_unittests_deps"
+          "breakpad_unittests"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "breakpad_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ skipping 92 matching lines @@
         "test": "media_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "net_unittests"
       },
       {
         "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
+          "sandbox_linux_unittests"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ skipping 60 matching lines @@
         "test": "android_webview_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "base_unittests"
       },
       {
         "override_compile_targets": [
-          "breakpad_unittests_deps"
+          "breakpad_unittests"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "breakpad_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ skipping 92 matching lines @@
         "test": "media_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "net_unittests"
       },
       {
         "override_compile_targets": [
-          "sandbox_linux_unittests_deps"
+          "sandbox_linux_unittests"
         ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
         "test": "sandbox_linux_unittests"
       },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ skipping 1205 matching lines @@
               "device_type": "gce_x86"
             }
           ],
           "hard_timeout": 960,
           "shards": 1
         }
       }
     ]
   }
 }