Revert of Make components_browsertests swarmable and add to main waterfall.

testing/buildbot/chromium_memory_trybot.json

 {
   "gtest_tests": [
     "accessibility_unittests",
     {
       "test": "base_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
     {
       "test": "browser_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 10
       }
     },
     "cacheinvalidation_unittests",
     "cc_unittests",
     {
-      "test": "components_browsertests",
-      "swarming": {
-        "can_use_on_swarming_builders": true
-      }
-    },
-    {
       "test": "components_unittests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
     },
     {
       "test": "content_browsertests",
       "swarming": {
         "can_use_on_swarming_builders": true
       }
@@ skipping 56 matching lines @@
     {
       "test": "unit_tests",
       "swarming": {
         "can_use_on_swarming_builders": true,
         "shards": 2
       }
     },
     "url_unittests"
   ]
 }