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

scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json

Index: scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
similarity index 91%
rename from scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
rename to scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
index c8b78a100cb1a0165b80dfd8c9178462700e5302..348aa25b24ef04850b7a41f548cf005cd802ac62 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
@@ -270,62 +270,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"
-    ],
-    "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 returned non-zero exit code: 2",
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -516,7 +475,7 @@
   },
   {
     "name": "$result",
-    "reason": "Infra Failure: Step('device_status') returned 2",
+    "reason": "Infra Failure: Step('device_status_check') returned 2",
     "recipe_result": null,
     "status_code": 2
   }