Misc Chromedriver bot fixes.

scripts/slave/recipe_modules/chromium_android/api.py

Index: scripts/slave/recipe_modules/chromium_android/api.py
diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
index 87f53a5911d18d33d0002edb489de3d714abf5e3..a55c892050c6abdbceb39cd86f439bb33144b50e 100644
--- a/scripts/slave/recipe_modules/chromium_android/api.py
+++ b/scripts/slave/recipe_modules/chromium_android/api.py
@@ -943,7 +943,7 @@ class AndroidApi(recipe_api.RecipeApi):
     )
 
   def common_tests_setup_steps(self, perf_setup=False,
-                               remove_system_webview=False):
+                               remove_system_webview=False, skip_wipe=False):
     self.create_adb_symlink()
     if self.c.gce_setup:
       self.launch_gce_instances(snapshot=self.c.gce_snapshot,
@@ -963,6 +963,8 @@ class AndroidApi(recipe_api.RecipeApi):
             'max_battery_temp': 350}
       else:
         kwargs = {}
+      if skip_wipe:
+        kwargs['skip_wipe'] = True
       self.provision_devices(remove_system_webview=remove_system_webview,
                              **kwargs)
       self.device_status()