Revert "Switch webview bots to google devices."

This reverts commit 621bb15ad1dbd50f6088becff0f57c51d0999825.

Reason for revert: Causing test failures.

Original change's description:
> Switch webview bots to google devices.
> 
> Bug: 814405
> Change-Id: I217f731c39f9ad0576ce98236c7c7dc78cf71dd4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1592874
> Commit-Queue: Andrew Luo <aluo@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#663371}

TBR=bpastene@chromium.org,jbudorick@chromium.org,aluo@chromium.org

Change-Id: Id6dc44aa24c8cd9671a5b3a2e26710838ef6fe20
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 814405
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629919
Reviewed-by: Andrew Luo <aluo@chromium.org>
Commit-Queue: Andrew Luo <aluo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663391}
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
index e2c7173..e43bfac 100644
--- a/testing/buildbot/chromium.android.fyi.json
+++ b/testing/buildbot/chromium.android.fyi.json
@@ -35,10 +35,9 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "OPR3.170623.008",
-              "device_os_flavor": "google",
+              "device_os": "OPD3.170816.023",
               "device_os_type": "userdebug",
-              "device_type": "marlin",
+              "device_type": "walleye",
               "os": "Android"
             }
           ],
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
index 553454c..aa47c9a 100644
--- a/testing/buildbot/chromium.android.json
+++ b/testing/buildbot/chromium.android.json
@@ -33,8 +33,7 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "LMY48I",
-              "device_os_flavor": "google",
+              "device_os": "LMY47I",
               "device_os_type": "userdebug",
               "device_type": "hammerhead",
               "os": "Android"
@@ -83,8 +82,7 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "LMY48I",
-              "device_os_flavor": "google",
+              "device_os": "LMY47I",
               "device_os_type": "userdebug",
               "device_type": "hammerhead",
               "os": "Android"
@@ -129,8 +127,7 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "LMY48I",
-              "device_os_flavor": "google",
+              "device_os": "LMY47I",
               "device_os_type": "userdebug",
               "device_type": "hammerhead",
               "os": "Android"
@@ -178,10 +175,10 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "MMB29Q",
-              "device_os_flavor": "google",
+              "device_os": "MRA58Z",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
-              "device_type": "bullhead",
+              "device_type": "hammerhead",
               "os": "Android"
             }
           ],
@@ -228,10 +225,10 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "MMB29Q",
-              "device_os_flavor": "google",
+              "device_os": "MRA58Z",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
-              "device_type": "bullhead",
+              "device_type": "hammerhead",
               "os": "Android"
             }
           ],
@@ -274,10 +271,10 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "MMB29Q",
-              "device_os_flavor": "google",
+              "device_os": "MRA58Z",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
-              "device_type": "bullhead",
+              "device_type": "hammerhead",
               "os": "Android"
             }
           ],
@@ -323,8 +320,8 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "NRD90M",
-              "device_os_flavor": "google",
+              "device_os": "NMF27E",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
               "device_type": "bullhead",
               "os": "Android"
@@ -373,8 +370,8 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "NRD90M",
-              "device_os_flavor": "google",
+              "device_os": "NMF27E",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
               "device_type": "bullhead",
               "os": "Android"
@@ -419,8 +416,8 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "NRD90M",
-              "device_os_flavor": "google",
+              "device_os": "NMF27E",
+              "device_os_flavor": "aosp",
               "device_os_type": "userdebug",
               "device_type": "bullhead",
               "os": "Android"
@@ -468,10 +465,9 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "OPR3.170623.008",
-              "device_os_flavor": "google",
+              "device_os": "OPD3.170816.023",
               "device_os_type": "userdebug",
-              "device_type": "marlin",
+              "device_type": "walleye",
               "os": "Android"
             }
           ],
@@ -518,10 +514,9 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "OPR3.170623.008",
-              "device_os_flavor": "google",
+              "device_os": "OPD3.170816.023",
               "device_os_type": "userdebug",
-              "device_type": "marlin",
+              "device_type": "walleye",
               "os": "Android"
             }
           ],
@@ -564,10 +559,9 @@
           ],
           "dimension_sets": [
             {
-              "device_os": "OPR3.170623.008",
-              "device_os_flavor": "google",
+              "device_os": "OPD3.170816.023",
               "device_os_type": "userdebug",
-              "device_type": "marlin",
+              "device_type": "walleye",
               "os": "Android"
             }
           ],
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 47e3209..eb87cea 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -96,9 +96,7 @@
         'swarming': {
           'dimension_sets': [
             {
-              'device_os': 'LMY48I',
-              'device_os_flavor': 'google',
-              'device_os_type': 'userdebug',
+              'device_os': 'LMY47I',
               'device_type': 'hammerhead',
               'os': 'Android',
             },
@@ -114,10 +112,9 @@
         'swarming': {
           'dimension_sets': [
             {
-              'device_os': 'MMB29Q',
-              'device_os_flavor': 'google',
-              'device_os_type': 'userdebug',
-              'device_type': 'bullhead',
+              'device_os': 'MRA58Z',
+              'device_os_flavor': 'aosp',
+              'device_type': 'hammerhead',
               'os': 'Android',
             },
           ],
@@ -132,9 +129,8 @@
         'swarming': {
           'dimension_sets': [
             {
-              'device_os': 'NRD90M',
-              'device_os_flavor': 'google',
-              'device_os_type': 'userdebug',
+              'device_os': 'NMF27E',
+              'device_os_flavor': 'aosp',
               'device_type': 'bullhead',
               'os': 'Android',
             },
@@ -150,10 +146,8 @@
         'swarming': {
           'dimension_sets': [
             {
-              'device_os': 'OPR3.170623.008',
-              'device_os_flavor': 'google',
-              'device_os_type': 'userdebug',
-              'device_type': 'marlin',
+              'device_os': 'OPD3.170816.023',
+              'device_type': 'walleye',
               'os': 'Android',
             },
           ],
@@ -553,9 +547,8 @@
         'swarming': {
           'dimension_sets': [
             {
-              'device_os': 'OPR3.170623.008',
-              'device_os_flavor': 'google',
-              'device_type': 'marlin',
+              'device_os': 'OPD3.170816.023',
+              'device_type': 'walleye',
               'os': 'Android',
             },
           ],
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index febff40..1ca694f 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -38,8 +38,8 @@
 
     'chromium.android': {
       'Android ASAN (dbg)': 'android_clang_asan_debug_bot',
-      'Android arm Builder (dbg)': 'android_webview_google_debug_static_bot',
-      'Android arm64 Builder (dbg)': 'android_webview_google_debug_static_bot_arm64',
+      'Android arm Builder (dbg)': 'android_debug_static_bot',
+      'Android arm64 Builder (dbg)': 'android_debug_static_bot_arm64',
       'Android x64 Builder (dbg)': 'android_debug_static_bot_x64',
       'Android x86 Builder (dbg)': 'android_debug_static_bot_x86',
       'Cast Android (dbg)': 'android_cast_debug_static_bot',
@@ -1084,14 +1084,6 @@
       'android_without_codecs', 'shared_release_bot', 'x64', 'dcheck_always_on',
     ],
 
-    'android_webview_google_debug_static_bot': [
-      'android', 'debug_static_bot', 'webview_google',
-    ],
-
-    'android_webview_google_debug_static_bot_arm64': [
-      'android', 'debug_static_bot', 'arm64', 'webview_google',
-    ],
-
     'android_without_codecs_debug_bot': [
       'android_without_codecs', 'debug_bot',
     ],
@@ -2418,10 +2410,6 @@
       'gn_args': 'android32_ndk_api_level=26 android64_ndk_api_level=26',
     },
 
-    'webview_google': {
-      'gn_args': 'system_webview_package_name="com.google.android.webview"',
-    },
-
     'win_cross': {
       'gn_args': 'target_os="win"',
     },