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

mojo/devtools/common/mojo_run

Index: mojo/devtools/common/mojo_run
diff --git a/mojo/devtools/common/mojo_run b/mojo/devtools/common/mojo_run
index 9c5e52ac1f92f0702f1be09f2b7d9748963cb03b..b4f82c5f3586c0642684c55198def9a41af0d6e3 100755
--- a/mojo/devtools/common/mojo_run
+++ b/mojo/devtools/common/mojo_run
@@ -90,18 +90,18 @@ def main():
   if mojo_paths:
     if script_args.android and not script_args.adb_path:
       script_args.adb_path = mojo_paths['adb']
-    if script_args.android and not script_args.origin_path:
-      script_args.origin_path = mojo_paths['build']
+    if script_args.android and not script_args.origin:
+      script_args.origin = mojo_paths['build']
     if not script_args.shell_path:
       script_args.shell_path = mojo_paths['shell']
 
     if script_args.verbose:
       print 'Running within a Chromium-style checkout.'
-      print ' - using the locally built shell at ' + script_args.shell_path
-      if script_args.origin_path:
-        print ' - using the local origin of ' + script_args.origin_path
+      print ' - using the locally built shell at: ' + script_args.shell_path
+      if script_args.origin:
+        print ' - using the origin:  ' + script_args.origin
       if script_args.android:
-        print ' - using adb path of ' + script_args.adb_path
+        print ' - using the adb path: ' + script_args.adb_path
   elif script_args.verbose:
     print 'Running outside a Chromium-style checkout.'