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

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

 [
   {
     "cmd": [
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
       "[BUILDER_CACHE]/Android_Remoting_Tests",
       "511"
     ],
     "name": "makedirs checkout path",
@@ skipping 401 matching lines @@
     ],
     "cwd": "[BUILDER_CACHE]/Android_Remoting_Tests",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android:%(PATH)s"
     },
     "name": "authorize_adb_devices"
   },
   {
     "cmd": [
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+      "[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android/buildbot/bb_device_status_check.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
       "--blacklist-file",
       "[BUILDER_CACHE]/Android_Remoting_Tests/src/out/bad_devices.json",
+      "--json-output",
+      "/path/to/tmp/json",
       "--known-devices-file",
-      "[HOME]/.android/known_devices.json",
-      "--adb-path",
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v"
+      "[HOME]/.android/known_devices.json"
     ],
     "cwd": "[BUILDER_CACHE]/Android_Remoting_Tests",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android:%(PATH)s"
     },
-    "name": "device_recovery"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android/provision_devices.py",
-      "--adb-path",
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/out/bad_devices.json",
-      "--output-device-blacklist",
-      "/path/to/tmp/json",
-      "-t",
-      "Release"
-    ],
-    "cwd": "[BUILDER_CACHE]/Android_Remoting_Tests",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android:%(PATH)s"
-    },
-    "name": "provision_devices"
-  },
-  {
-    "cmd": [
-      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/catapult/devil/devil/android/tools/device_status.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "--blacklist-file",
-      "[BUILDER_CACHE]/Android_Remoting_Tests/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_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
-      "-v",
-      "--overwrite-known-devices-files"
-    ],
-    "cwd": "[BUILDER_CACHE]/Android_Remoting_Tests",
-    "env": {
-      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
-      "PATH": "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android:%(PATH)s"
-    },
-    "name": "device_status",
+    "name": "device_status_check",
     "~followup_annotations": [
       "@@@STEP_TEXT@Online devices: 1@@@",
       "@@@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 79 matching lines @@
       "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"serial\": \"03e0363a003c6ad6\", @@@",
       "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"usb_status\": true@@@",
       "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
       "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
+      "[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android/provision_devices.py",
+      "--adb-path",
+      "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
+      "--blacklist-file",
+      "[BUILDER_CACHE]/Android_Remoting_Tests/src/out/bad_devices.json",
+      "--output-device-blacklist",
+      "/path/to/tmp/json",
+      "-t",
+      "Release"
+    ],
+    "cwd": "[BUILDER_CACHE]/Android_Remoting_Tests",
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Remoting_Tests/src/build/android:%(PATH)s"
+    },
+    "name": "provision_devices"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "restart",
       "--pid-file-path",
       "/tmp/device_monitor.pid",
       "--",
       "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
       "[BUILDER_CACHE]/Android_Remoting_Tests/src/third_party/android_tools/sdk/platform-tools/adb",
       "[\"07a00ca4\"]",
       "--blacklist-file",
@@ skipping 208 matching lines @@
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
     "reason": "1 tests failed: ['ChromotingTest']",
     "recipe_result": null,
     "status_code": 1
   }
 ]