[Android] Add APK under test and additional APK support for the old mode.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 432 matching lines @@
       args.coverage_dir,
       args.test_apk,
       args.test_apk_path,
       args.test_apk_jar_path,
       args.test_runner,
       args.test_support_apk_path,
       args.device_flags,
       args.isolate_file_path,
       args.set_asserts,
       args.delete_stale_data,
-      args.timeout_scale)
+      args.timeout_scale,
+      args.apk_under_test,
+      args.additional_apks)
 
 
 def AddUIAutomatorTestOptions(parser):
   """Adds UI Automator test options to |parser|."""
 
   group = parser.add_argument_group('UIAutomator Test Options')
   AddJavaTestOptions(group)
   group.add_argument(
       '--package', required=True, choices=constants.PACKAGE_INFO.keys(),
       metavar='PACKAGE', help='Package under test.')
@@ skipping 620 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())