Move ContentShell and ChromiumTestShell instrumentation tests to main waterfall.

build/android/buildbot/buildbot_functions.sh

Index: build/android/buildbot/buildbot_functions.sh
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index 9f56a18e5c6eacdf9786130df314f5ea23799e05..d5c5940834f3221c9fa289bb7f00ea4eded00b68 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -319,6 +319,10 @@ function bb_run_instrumentation_tests {
       "org.chromium.content_shell" "ContentShellTest"
   bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \
       "org.chromium.chrome.testshell" "ChromiumTestShellTest"
+}
+
+# Run instrumentation tests for experimental APKs on device.
+function bb_run_experimental_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "AndroidWebView.apk" \
       "org.chromium.android_webview" "AndroidWebViewTest"
 }