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

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

Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
index 3ab6c8611a58b55a3974611a82f81dea872489da..42908604ea51e1b7ac499aefc89498bc353b97a5 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ClangToTAndroidASan_tester.json
@@ -371,60 +371,15 @@
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/out/bad_devices.json",
-      "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--adb-path",
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v"
-    ],
-    "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "LLVM_FORCE_HEAD_REVISION": "YES",
-      "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
-    },
-    "name": "device_recovery"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android/provision_devices.py",
+      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android/buildbot/bb_device_status_check.py",
       "--adb-path",
       "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/out/bad_devices.json",
-      "--output-device-blacklist",
-      "/path/to/tmp/json",
-      "-t",
-      "Debug"
-    ],
-    "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "LLVM_FORCE_HEAD_REVISION": "YES",
-      "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
-    },
-    "name": "provision_devices"
-  },
-  {
-    "cmd": [
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/catapult/devil/devil/android/tools/device_status.py",
       "--json-output",
       "/path/to/tmp/json",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/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]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v",
-      "--overwrite-known-devices-files"
+      "[HOME]/.android/known_devices.json"
     ],
     "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
     "env": {
@@ -432,7 +387,7 @@
       "LLVM_FORCE_HEAD_REVISION": "YES",
       "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
     },
-    "name": "device_status",
+    "name": "device_status_check",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -530,6 +485,28 @@
   },
   {
     "cmd": [
+      "python",
+      "-u",
+      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android/provision_devices.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools/adb",
+      "--blacklist-file",
+      "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/out/bad_devices.json",
+      "--output-device-blacklist",
+      "/path/to/tmp/json",
+      "-t",
+      "Debug"
+    ],
+    "cwd": "[BUILDER_CACHE]/ClangToTAndroidASan_tester",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "LLVM_FORCE_HEAD_REVISION": "YES",
+      "PATH": "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/build/android:%(PATH)s"
+    },
+    "name": "provision_devices"
+  },
+  {
+    "cmd": [
       "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/tools/android/asan/third_party/asan_device_setup.sh",
       "--lib",
       "[BUILDER_CACHE]/ClangToTAndroidASan_tester/src/third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/linux/libclang_rt.asan-arm-android.so",