Revert of Extract media/capture/capture_unittests from media_unittests

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 2f3d29d17b43a2a621048ec8348143752c232c3f..4c129f9f87f869bea48f84adaa4233f0ec926c61 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -98,19 +98,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "override_isolate_target": "capture_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "MMB29Q",
-              "device_type": "bullhead"
-            }
-          ]
-        },
-        "test": "capture_unittests"
-      },
-      {
         "override_isolate_target": "cc_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -525,19 +512,6 @@
           ]
         },
         "test": "breakpad_unittests"
-      },
-      {
-        "override_isolate_target": "capture_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "KTU84P",
-              "device_type": "hammerhead"
-            }
-          ]
-        },
-        "test": "capture_unittests"
       },
       {
         "override_isolate_target": "cc_unittests",
@@ -1007,9 +981,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1114,9 +1085,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1224,9 +1192,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1332,9 +1297,6 @@
           "breakpad_unittests_deps"
         ],
         "test": "breakpad_unittests"
-      },
-      {
-        "test": "capture_unittests"
       },
       {
         "test": "cc_unittests"
@@ -1455,9 +1417,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1565,9 +1524,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1681,9 +1637,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {
@@ -1791,9 +1744,6 @@
         "test": "breakpad_unittests"
       },
       {
-        "test": "capture_unittests"
-      },
-      {
         "test": "cc_unittests"
       },
       {