Update from https://crrev.com/317530

mojo/tools/mojob.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.
 
 # This a simple script to make building/testing Mojo components easier.
 
 import argparse
 from copy import deepcopy
 import os
 import subprocess
 import sys
 
 from get_test_list import GetTestList
 from mopy.config import Config
 from mopy.paths import Paths
 from mopy.gn import GNArgsForConfig, ParseGNConfig, CommandLineForGNArgs
 
 
 def _args_to_config(args):
   # Default to host OS.
   target_os = None
   if args.android:
     target_os = Config.OS_ANDROID
   elif args.chromeos:
     target_os = Config.OS_CHROMEOS
 
-  target_arch = args.target_arch
+  target_cpu = args.target_cpu
 
   additional_args = {}
 
   if 'clang' in args:
     additional_args['is_clang'] = args.clang
 
   if 'asan' in args and args.asan:
     additional_args['sanitizer'] = Config.SANITIZER_ASAN
 
   # Additional non-standard config entries:
@@ skipping 18 matching lines @@
 
   if 'builder_name' in args:
     additional_args['builder_name'] = args.builder_name
   if 'build_number' in args:
     additional_args['build_number'] = args.build_number
   if 'master_name' in args:
     additional_args['master_name'] = args.master_name
   if 'test_results_server' in args:
     additional_args['test_results_server'] = args.test_results_server
 
-  return Config(target_os=target_os, target_arch=target_arch,
+  return Config(target_os=target_os, target_cpu=target_cpu,
                 is_debug=args.debug, dcheck_always_on=args.dcheck_always_on,
                 **additional_args)
 
 
 def _get_out_dir(config):
   paths = Paths(config)
   return paths.SrcRelPath(paths.build_dir)
 
 
 def sync(config):
@@ skipping 106 matching lines @@
                            default=True, action='store_true')
   debug_group.add_argument('--release', help='Release build', default=False,
                            dest='debug', action='store_false')
 
   os_group = parent_parser.add_mutually_exclusive_group()
   os_group.add_argument('--android', help='Build for Android',
                         action='store_true')
   os_group.add_argument('--chromeos', help='Build for ChromeOS',
                         action='store_true')
 
-  parent_parser.add_argument('--target-arch',
+  parent_parser.add_argument('--target-cpu',
                              help='CPU architecture to build for.',
                              choices=['x64', 'x86', 'arm'])
 
   parent_parser.add_argument('--nacl', help='Add in NaCl', default=False,
                              action='store_true')
 
   subparsers = parser.add_subparsers()
 
   sync_parser = subparsers.add_parser('sync', parents=[parent_parser],
       help='Sync using gclient (does not run gn).')
@@ skipping 39 matching lines @@
       help='Run NaCl unit tests (does not build).')
   nacltest_parser.set_defaults(func=nacltest)
 
   args = parser.parse_args()
   config = _args_to_config(args)
   return args.func(config)
 
 
 if __name__ == '__main__':
   sys.exit(main())