Support --origin in android_mojo_shell.

mojo/tools/apptest_runner.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """A test runner for gtest application tests."""
 
 import argparse
 import ast
 import logging
@@ skipping 25 matching lines @@
 
   config = ConfigForGNArgs(ParseGNConfig(args.build_dir))
 
   execution_globals = {
       "config": config,
   }
   exec args.apptest_list_file in execution_globals
   apptest_list = execution_globals["tests"]
   _logging.debug("Test list: %s" % apptest_list)
 
-  android_origin_argument = None
+  extra_args = []
   if config.target_os == Config.OS_ANDROID:
-    android_origin_argument = android.PrepareShellRun(config)
+    extra_args.extend(android.PrepareShellRun(config))
 
   gtest.set_color()
   mojo_paths = Paths(config)
 
   exit_code = 0
   for apptest_dict in apptest_list:
     apptest = apptest_dict["test"]
     test_args = apptest_dict.get("test-args", [])
-    shell_args = apptest_dict.get("shell-args", [])
-    if android_origin_argument:
-      shell_args.append(android_origin_argument)
+    shell_args = apptest_dict.get("shell-args", []) + extra_args
     launched_services = apptest_dict.get("launched-services", [])
 
     print "Running " + apptest + "...",
     sys.stdout.flush()
 
     # List the apptest fixtures so they can be run independently for isolation.
     # TODO(msw): Run some apptests without fixture isolation?
     fixtures = gtest.get_fixtures(config, shell_args, apptest)
 
     if not fixtures:
@@ skipping 37 matching lines @@
     launcher_args = [
         '--shell-path=' + apps.socket_path,
         '--app-url=' + application,
         '--app-path=' + mojo_paths.FileFromUrl(application),
         '--app-args=' + " ".join(application_args)]
     return gtest.run_test(config, launcher_args, run_launcher=True)
 
 
 if __name__ == '__main__':
   sys.exit(main())