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

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

Index: scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
similarity index 91%
rename from scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
rename to scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
index 348aa25b24ef04850b7a41f548cf005cd802ac62..c362cb751c3ead3682103c86ea3786964b905c75 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json
@@ -270,21 +270,62 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+      "[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",
       "--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"
+      "[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_check",
+    "name": "device_status",
     "~followup_annotations": [
       "step returned non-zero exit code: 2",
       "@@@STEP_LOG_LINE@json.output@[@@@",
@@ -304,11 +345,11 @@
       "@@@STEP_LOG_LINE@json.output@      \"voltage\": \"4286\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"build\": \"LRX21O\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"imei_slice\": \"Unknown\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ro.build.id\": \"LRX21O\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"ro.build.product\": \"product_name\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"serial\": \"07a00ca4\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"flo\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"wifi_ip\": \"\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
@@ -475,7 +516,7 @@
   },
   {
     "name": "$result",
-    "reason": "Infra Failure: Step('device_status_check') returned 2",
+    "reason": "Infra Failure: Step('device_status') returned 2",
     "recipe_result": null,
     "status_code": 2
   }