Update from https://crrev.com/317530

mojo/tools/upload_binaries.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 import argparse
 import glob
 import os
 import subprocess
 import sys
 import tempfile
 import time
 import zipfile
 
 import mopy.gn as gn
 from mopy.config import Config
 from mopy.paths import Paths
 from mopy.version import Version
 
 BLACKLISTED_APPS = [
     # The network service apps are not produced out of the Mojo repo, but may
     # be present in the build dir.
     "network_service.mojo",
     "network_service_apptests.mojo",
 ]
 
 def target(config):
-  return config.target_os + "-" + config.target_arch
+  return config.target_os + "-" + config.target_cpu
 
 def find_apps_to_upload(build_dir):
   apps = []
   for path in glob.glob(build_dir + "/*"):
     if not os.path.isfile(path):
       continue
     _, ext = os.path.splitext(path)
     if ext != '.mojo':
       continue
     if os.path.basename(path) in BLACKLISTED_APPS:
@@ skipping 90 matching lines @@
 
   apps_to_upload = find_apps_to_upload(
       gn.BuildDirectoryForConfig(config, Paths(config).src_root))
   for app in apps_to_upload:
     upload_app(app, config, args.dry_run)
 
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())