Update from https://crrev.com/306901

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 49e6a4818785fc06ebde8dd5c5c6c0aded6c173c..e1858cef8b80da2f6e4c8be10d548a729a04e504 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -78,13 +78,18 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'org.chromium.chrome.browser.sync',
       'ChromeSyncShellTest',
       None),
-    I('ChromeDriverWebViewShell',
-      'ChromeDriverWebViewShell.apk',
-      'org.chromium.chromedriver_webview_shell',
-      None,
-      None),
     ])
 
+InstallablePackage = collections.namedtuple('InstallablePackage', [
+    'name', 'apk', 'apk_package'])
+
+INSTALLABLE_PACKAGES = dict((package.name, package) for package in (
+    [InstallablePackage(i.name, i.apk, i.apk_package)
+     for i in INSTRUMENTATION_TESTS.itervalues()] +
+    [InstallablePackage('ChromeDriverWebViewShell',
+                        'ChromeDriverWebViewShell.apk',
+                        'org.chromium.chromedriver_webview_shell')]))
+
 VALID_TESTS = set(['chromedriver', 'chrome_proxy', 'gpu',
                    'telemetry_unittests', 'telemetry_perf_unittests', 'ui',
                    'unit', 'webkit', 'webkit_layout', 'python_unittests'])
@@ -644,8 +649,8 @@ def MainTestWrapper(options):
 
     if options.install:
       for i in options.install:
-        test_obj = INSTRUMENTATION_TESTS[i]
-        InstallApk(options, test_obj, print_step=True)
+        install_obj = INSTALLABLE_PACKAGES[i]
+        InstallApk(options, install_obj, print_step=True)
 
     if options.test_filter:
       bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)