Misc Chromedriver bot fixes.

scripts/slave/recipes/chromedriver.py

Index: scripts/slave/recipes/chromedriver.py
diff --git a/scripts/slave/recipes/chromedriver.py b/scripts/slave/recipes/chromedriver.py
index 7ce9c0177af4b740e137e58fa169e45a38d5bc10..90a7d5213e2241b17be6ba7cd554bb8850fc1011 100644
--- a/scripts/slave/recipes/chromedriver.py
+++ b/scripts/slave/recipes/chromedriver.py
@@ -28,9 +28,9 @@ BUILDERS = freeze({
       'update_test_log': True,
       'android_packages': [
         'chrome_beta',
-        'chrome_public',
         'chrome_stable',
         'chromedriver_webview_shell',
+        'chromium',
       ],
       'install_apks': [
         'ChromeDriverWebViewShell.apk',
@@ -71,7 +71,7 @@ def RunSteps(api):
   revision_cp = api.bot_update.last_returned_properties['got_revision_cp']
   commit_position = api.commit_position.parse_revision(revision_cp)
 
-  api.chromium_android.common_tests_setup_steps()
+  api.chromium_android.common_tests_setup_steps(skip_wipe=True)
   if builder['install_apks']:
     for apk in builder['install_apks']:
       api.chromium_android.adb_install_apk(apk)
@@ -89,6 +89,9 @@ def RunSteps(api):
 
   api.chromium_android.common_tests_final_steps()
 
+  if not passed:
+    raise api.step.StepFailure('Test failures')
+
 def GenTests(api):
   sanitize = lambda s: ''.join(c if c.isalnum() else '_' for c in s)