Revert "[Android] Reland splitting of device recovery and device status."

scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json

Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
index b6a35d0a52cc3d89a52a6d8ea8c2e8f720ba786e..d3c35136e06e3862d774835b30ab824179e8b846 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Webview_L__dbg_.json
@@ -372,66 +372,22 @@
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/out/bad_devices.json",
-      "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--adb-path",
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v"
-    ],
-    "cwd": "[BUILDER_CACHE]/Android_Webview_L__dbg_",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android:%(PATH)s"
-    },
-    "name": "device_recovery"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android/provision_devices.py",
+      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android/buildbot/bb_device_status_check.py",
       "--adb-path",
       "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/out/bad_devices.json",
-      "--output-device-blacklist",
-      "/path/to/tmp/json",
-      "-t",
-      "Debug",
-      "--remove-system-webview"
-    ],
-    "cwd": "[BUILDER_CACHE]/Android_Webview_L__dbg_",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android:%(PATH)s"
-    },
-    "name": "provision_devices"
-  },
-  {
-    "cmd": [
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/out/bad_devices.json",
       "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--buildbot-path",
-      "/home/chrome-bot/.adb_device_info",
-      "--adb-path",
-      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v",
-      "--overwrite-known-devices-files"
+      "[HOME]/.android/known_devices.json"
     ],
     "cwd": "[BUILDER_CACHE]/Android_Webview_L__dbg_",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android:%(PATH)s"
     },
-    "name": "device_status",
+    "name": "device_status_check",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -531,6 +487,28 @@
     "cmd": [
       "python",
       "-u",
+      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android/provision_devices.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools/adb",
+      "--blacklist-file",
+      "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/out/bad_devices.json",
+      "--output-device-blacklist",
+      "/path/to/tmp/json",
+      "-t",
+      "Debug",
+      "--remove-system-webview"
+    ],
+    "cwd": "[BUILDER_CACHE]/Android_Webview_L__dbg_",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/Android_Webview_L__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Webview_L__dbg_/src/build/android:%(PATH)s"
+    },
+    "name": "provision_devices"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "restart",