Fixes TestContentProvider issues in AndroidWebView

build/android/buildbot/bb_device_steps.py

Index: build/android/buildbot/bb_device_steps.py
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 2cb431ed88b8de620212c936f1609340d6b92f4a..b6ba481f07bfc4bf568e7aee4550346a8f8e0767 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -141,6 +141,14 @@ def InstallApk(options, test, print_step=False):
   """
   if print_step:
     bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
+  # TODO(gkanwar): Quick hack to make sure AndroidWebViewTest.apk is replaced
+  # before AndroidWebView.apk is. This can be removed once the bots cycle.
+  args = ['--apk', '%s.apk' % test.test_apk]
+  if options.target == 'Release':
+    args.append('--release')
+
+  RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
+
   args = ['--apk', test.apk, '--apk_package', test.apk_package]
   if options.target == 'Release':
     args.append('--release')