Update from https://crrev.com/306901

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 60 matching lines @@
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     I('ChromeSyncShell',
       'ChromeSyncShell.apk',
       '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'])
 
 RunCmd = bb_utils.RunCmd
 
 
 def _GetRevision(options):
   """Get the SVN revision number.
 
@@ skipping 539 matching lines @@
   try:
     # Spawn logcat monitor
     SpawnLogcatMonitor()
 
     # Run all device setup steps
     for _, cmd in GetDeviceSetupStepCmds():
       cmd(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)
 
     if options.coverage_bucket:
       coverage_html = GenerateJavaCoverageReport(options)
       UploadHTML(options, '%s/java' % options.coverage_bucket, coverage_html,
                  'Coverage Report')
       shutil.rmtree(coverage_html, ignore_errors=True)
 
@@ skipping 83 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))