Only run content_browsertests on experimental WebRTC FYI android bots.

It turns out that's how it works in the old waterfall, so let's
keep doing that.

Bug: 877018
Change-Id: If3132684e299a8b090e4b9ed82b3f5be1cb7fe74
Reviewed-on: https://chromium-review.googlesource.com/1230061Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592344}

testing/buildbot/chromium.webrtc.fyi.experimental.json

@@ -3,30 +3,6 @@
   "AAAAA2 See generate_buildbot_json.py to make changes": {},
   "WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)": {
     "gtest_tests": [
-      {
-        "args": [
-          "--gtest_filter=WebRtcApprtcBrowserTest.*",
-          "--run-manual",
-          "--test-launcher-jobs=1"
-        ],
-        "name": "browser_tests_apprtc",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "browser_tests"
-      },
-      {
-        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
-          "--run-manual",
-          "--test-launcher-jobs=1"
-        ],
-        "name": "browser_tests_functional",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--gtest_filter=WebRtc*"
@@ -35,71 +11,11 @@
           "can_use_on_swarming_builders": true
         },
         "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--gtest_filter=WebRtc*MANUAL*:-UsingRealWebcam*",
-          "--run-manual",
-          "--ui-test-action-max-timeout=120000"
-        ],
-        "name": "content_browsertests_stress",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "jingle_unittests"
-      },
-      {
-        "args": [
-          "--gtest_filter=Webrtc*"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "remoting_unittests"
       }
     ]
   },
   "WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)": {
     "gtest_tests": [
-      {
-        "args": [
-          "--gtest_filter=WebRtcApprtcBrowserTest.*",
-          "--run-manual",
-          "--test-launcher-jobs=1"
-        ],
-        "name": "browser_tests_apprtc",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "browser_tests"
-      },
-      {
-        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc_functional.browser_tests.filter",
-          "--run-manual",
-          "--test-launcher-jobs=1"
-        ],
-        "name": "browser_tests_functional",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--gtest_filter=WebRtc*"
@@ -108,42 +24,6 @@
           "can_use_on_swarming_builders": true
         },
         "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--gtest_filter=WebRtc*MANUAL*:-UsingRealWebcam*",
-          "--run-manual",
-          "--ui-test-action-max-timeout=120000"
-        ],
-        "name": "content_browsertests_stress",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--test-launcher-filter-file=../../testing/buildbot/filters/webrtc.content_unittests.filter"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "content_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "jingle_unittests"
-      },
-      {
-        "args": [
-          "--gtest_filter=Webrtc*"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "remoting_unittests"
       }
     ]
   },

testing/buildbot/test_suites.pyl

@@ -895,6 +895,12 @@
     },
   },
 
+  'webrtc_chromium_android_gtests': {
+    'content_browsertests': {
+      'args': ['--gtest_filter=WebRtc*'],
+    },
+  },
+
   'webrtc_chromium_gtests': {
     'content_browsertests': {
       # Run all normal WebRTC content_browsertests. This is mostly so

testing/buildbot/waterfalls.pyl

@@ -3470,12 +3470,12 @@
     'machines': {
       'WebRTC Chromium FYI Android Tests (dbg) (K Nexus5)': {
         'test_suites': {
-          'gtest_tests': 'webrtc_chromium_gtests',
+          'gtest_tests': 'webrtc_chromium_android_gtests',
         },
       },
       'WebRTC Chromium FYI Android Tests (dbg) (M Nexus5X)': {
         'test_suites': {
-          'gtest_tests': 'webrtc_chromium_gtests',
+          'gtest_tests': 'webrtc_chromium_android_gtests',
         },
       },
       'WebRTC Chromium FYI Linux Tester': {