Misc Chromedriver bot fixes.

scripts/slave/recipes/chromedriver.expected/Android_ChromeDriver_Tests__dbg__test_failure.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.fyi",
       "--builder",
       "Android ChromeDriver Tests (dbg)",
@@ skipping 229 matching lines @@
       "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",
-      "Debug"
+      "Debug",
+      "--skip-wipe"
     ],
     "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",
@@ skipping 341 matching lines @@
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_4/server_log",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
-      "chrome_public"
+      "chrome_stable"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chrome_public)"
+    "name": "python_tests(chrome_stable)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
@@ skipping 18 matching lines @@
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_5/server_log",
       "--verbose",
       "--android-package",
-      "chrome_public"
+      "chrome_stable"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chrome_public)"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
-      "--",
-      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "[TMP_BASE]/server_log_tmp_5/server_log",
-      "gs://chromedriver-data/server_logs/server_log"
-    ],
-    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_5/server_log",
+    "name": "java_tests(chrome_stable)",
     "~followup_annotations": [
-      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_5/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
+      "step returned non-zero exit code: 1",
+      "@@@STEP_FAILURE@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_5"
     ],
     "name": "rmtree [TMP_BASE]/server_log_tmp_5"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_6/server_log",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
-      "chrome_stable"
+      "chromedriver_webview_shell"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chrome_stable)"
+    "name": "python_tests(chromedriver_webview_shell)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
@@ skipping 18 matching lines @@
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_7/server_log",
       "--verbose",
       "--android-package",
-      "chrome_stable"
+      "chromedriver_webview_shell"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chrome_stable)",
+    "name": "java_tests(chromedriver_webview_shell)"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
+      "--",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+      "----",
+      "cp",
+      "[TMP_BASE]/server_log_tmp_7/server_log",
+      "gs://chromedriver-data/server_logs/server_log"
+    ],
+    "name": "gsutil Upload Server Log, [TMP_BASE]/server_log_tmp_7/server_log",
     "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_FAILURE@@@"
+      "@@@STEP_LINK@server log [TMP_BASE]/server_log_tmp_7/server_log@https://storage.cloud.google.com/chromedriver-data/server_logs/server_log@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[recipe_engine::shutil]/resources/rmtree.py",
       "[TMP_BASE]/server_log_tmp_7"
     ],
     "name": "rmtree [TMP_BASE]/server_log_tmp_7"
   },
   {
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_py_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_8/server_log",
       "--reference-chromedriver",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/third_party/java_tests/reference_builds/chromedriver_linux64",
       "--android-package",
-      "chromedriver_webview_shell"
+      "chromium"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "python_tests(chromedriver_webview_shell)"
+    "name": "python_tests(chromium)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
@@ skipping 18 matching lines @@
     "cmd": [
       "xvfb-run",
       "-a",
       "[SLAVE_BUILD]/src/chrome/test/chromedriver/test/run_java_tests.py",
       "--chromedriver",
       "[SLAVE_BUILD]/src/out/Debug/chromedriver",
       "--log-path",
       "[TMP_BASE]/server_log_tmp_9/server_log",
       "--verbose",
       "--android-package",
-      "chromedriver_webview_shell"
+      "chromium"
     ],
     "env": {
       "PATH": "%(PATH)s:[SLAVE_BUILD]/src/chrome/test/chromedriver/chrome"
     },
-    "name": "java_tests(chromedriver_webview_shell)"
+    "name": "java_tests(chromium)"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
       "--",
       "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
       "----",
       "cp",
@@ skipping 220 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
+    "reason": "Test failures",
     "recipe_result": null,
-    "status_code": 0
+    "status_code": 1
   }
 ]