Relanding "Add apk for running content_browsertests"

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 json
 import multiprocessing
 import optparse
@@ skipping 23 matching lines @@
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
 #   test_apk: apk to run tests on.
 #   test_data: data folder in format destination:source.
 I_TEST = collections.namedtuple('InstrumentationTest', [
     'name', 'apk', 'apk_package', 'test_apk', 'test_data'])
 
 INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
     I_TEST('ContentShell',
            'ContentShell.apk',
-           'org.chromium.content_shell',
+           'org.chromium.content_shell_apk',
            'ContentShellTest',
            'content:content/test/data/android/device_files'),
     I_TEST('ChromiumTestShell',
            'ChromiumTestShell.apk',
            'org.chromium.chrome.testshell',
            'ChromiumTestShellTest',
            'chrome:chrome/test/data/android/device_files'),
     I_TEST('AndroidWebView',
            'AndroidWebView.apk',
            'org.chromium.android_webview',
@@ skipping 264 matching lines @@
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))