Move the logic to set up a local origin for shell run to shell_arguments.py.

mojo/tools/android_mojo_shell.py

Index: mojo/tools/android_mojo_shell.py
diff --git a/mojo/tools/android_mojo_shell.py b/mojo/tools/android_mojo_shell.py
index 7acd917059ed7a9eade2e47954267b94faccd663..c1a83b977c87cabc89e5557dd0467b35237e6388 100755
--- a/mojo/tools/android_mojo_shell.py
+++ b/mojo/tools/android_mojo_shell.py
@@ -64,11 +64,15 @@ def main():
                        logcat_tags=launcher_args.logcat_tags,
                        verbose_pipe=verbose_pipe)
   shell.InstallApk(paths.target_mojo_shell_path)
-  args.append("--origin=" + launcher_args.origin if launcher_args.origin else
-              shell.SetUpLocalOrigin(paths.build_dir))
+
   args = shell_arguments.RewriteMapOriginParameters(shell, args)
+  if launcher_args.origin:
+    args.append("--origin=" + launcher_args.origin)
+  else:
+    args.extend(shell_arguments.ConfigureLocalOrigin(shell, paths.build_dir))
   if launcher_args.debugger:
     args.extend(shell_arguments.ConfigureDebugger(shell))
+
   shell.Run(args)
   return 0