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

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n  for (path, dir, files) in os.walk(build_path):\n    for cur_file in files:\n      if cur_file.endswith('index.lock'):\n        path_to_file = os.path.join(path, cur_file)\n        print 'deleting %s' % path_to_file\n        os.remove(path_to_file)\n",
       "[SLAVE_BUILD]"
     ],
     "name": "cleanup index.lock",
     "~followup_annotations": [
@@ skipping 252 matching lines @@
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
     ],
     "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": "authorize_adb_devices"
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.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",
+      "--json-output",
+      "/path/to/tmp/json",
       "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--adb-path",
-      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v"
+      "[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_recovery"
-  },
-  {
-    "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"
-    ],
-    "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"
-    ],
-    "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@[@@@",
       "@@@STEP_LOG_LINE@json.output@  {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"battery\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"AC powered\": \"false\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"USB powered\": \"true\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"Wireless powered\": \"false\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"health\": \"2\", @@@",
@@ skipping 170 matching lines @@
     ],
     "env": {
       "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "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": "stack_tool_for_asan"
   },
   {
     "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
   }
 ]