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

scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json

Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json
index c873dbf013e2facb244844acee88e42f9578e099..40f4ce41cb8b2d882b9cb6f636a687b173c175ab 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_android_nexus5X_perf_bisect.json
@@ -193,69 +193,21 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--adb-path",
-      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v"
-    ],
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "device_recovery"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+      "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
       "--adb-path",
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json",
-      "--output-device-blacklist",
-      "/path/to/tmp/json",
-      "-t",
-      "Release",
-      "--min-battery-level",
-      "95",
-      "--disable-network",
-      "--disable-java-debug",
-      "--max-battery-temp",
-      "350",
-      "--remove-system-webview"
-    ],
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
-    },
-    "name": "provision_devices"
-  },
-  {
-    "cmd": [
-      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
-      "--blacklist-file",
-      "[SLAVE_BUILD]/src/out/bad_devices.json",
       "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--buildbot-path",
-      "/home/chrome-bot/.adb_device_info",
-      "--adb-path",
-      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v",
-      "--overwrite-known-devices-files"
+      "[HOME]/.android/known_devices.json"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "device_status",
+    "name": "device_status_check",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -355,6 +307,33 @@
     "cmd": [
       "python",
       "-u",
+      "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--output-device-blacklist",
+      "/path/to/tmp/json",
+      "-t",
+      "Release",
+      "--min-battery-level",
+      "95",
+      "--disable-network",
+      "--disable-java-debug",
+      "--max-battery-temp",
+      "350",
+      "--remove-system-webview"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "provision_devices"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "restart",