Roll infra/go/src/github.com/luci/luci-go/ 9380f91eb..ea3fb670b (22 commits).

build/build.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.
 
 """This script rebuilds Python & Go universes of infra.git multiverse and
 invokes CIPD client to package and upload chunks of it to the CIPD repository as
 individual packages.
 
 See build/packages/*.yaml for definition of packages and README.md for more
@@ skipping 673 matching lines @@
   # Nuke all previous copies, make sure out_dir exists.
   if os.path.exists(cipd_out_dir):
     for p in glob.glob(os.path.join(cipd_out_dir, 'cipd_*')):
       os.remove(p)
   else:
     os.makedirs(cipd_out_dir)
 
   # Build cipd client binary for the host platform.
   run_go_build(
       go_workspace,
-      package='github.com/luci/luci-go/client/cmd/cipd',
+      package='github.com/luci/luci-go/cipd/client/cmd/cipd',
       output=cipd_exe,
       rebuild=True,
       goos='',
       goarch='')
 
   return cipd_exe
 
 
 def get_build_out_file(package_out_dir, pkg_def):
   """Returns a path where to put built *.cipd package file.
@@ skipping 239 matching lines @@
       args.build,
       args.upload,
       args.service_url,
       args.tags or [],
       args.service_account_json,
       args.json_output)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))