Merge --origin and --origin-path in devtools scripts.

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 application tests."""
 
 import argparse
 import logging
 import os.path
@@ skipping 25 matching lines @@
   InitLogging(args.verbose_count)
   config = ConfigForGNArgs(ParseGNConfig(args.build_dir))
   paths = Paths(config)
   command_line = [os.path.join(os.path.dirname(__file__), os.path.pardir,
                                "devtools", "common", "mojo_test"),
                   str(args.test_list_file)]
 
   if config.target_os == Config.OS_ANDROID:
     command_line.append("--android")
     command_line.append("--adb-path=" + paths.adb_path)
-    command_line.append("--origin-path=" + paths.build_dir)
+    command_line.append("--origin=" + paths.build_dir)
 
   command_line.append("--shell-path=" + paths.target_mojo_shell_path)
   if args.verbose_count:
     command_line.append("--verbose")
 
   gtest.set_color()
   print "Running " + str(command_line)
   ret = subprocess.call(command_line)
   return ret
 
 
 if __name__ == '__main__':
   sys.exit(main())