Update prebuilts to ab/2774618
am: c62661f

* commit 'c62661f2e4dec7a93ab405ac0fd7028e1b59fbc6':
  Update prebuilts to ab/2774618

Change-Id: Ic3dbe42efa24a1ba1098a5a6309930cd84717364
diff --git a/README.ANDROID b/README.ANDROID
deleted file mode 100644
index eea1fde..0000000
--- a/README.ANDROID
+++ /dev/null
@@ -1,19 +0,0 @@
-The go prebuilts in this directory were compiled with:
-
-git clone https://github.com/golang/go.git /tmp/go
-cd /tmp/go/src
-git checkout go1.5.1
-# Go can't handle a relative GOROOT, but we don't know the absolute path
-# so set it to a relative path anyways.  The build system will have to
-# set the correct absolute GOROOT.
-export GOROOT_BOOTSTRAP=$TOP/prebuilts/go/darwin-x86
-GOROOT_FINAL=./prebuilts/go/darwin-x86 ./all.bash && ./race.bash
-
-cd $TOP/prebuilts/go/linux-x86
-git rm -r *
-git reset HEAD README.ANDROID
-git checkout README.ANDROID
-<update this file>
-cp -rp /tmp/go/* ./
-git add -A
-git commit
diff --git a/bin/go b/bin/go
index c0058a7..1237cab 100755
--- a/bin/go
+++ b/bin/go
Binary files differ
diff --git a/bin/gofmt b/bin/gofmt
index d72f445..28ef132 100755
--- a/bin/gofmt
+++ b/bin/gofmt
Binary files differ
diff --git a/doc/articles/wiki/final-test.patch b/doc/articles/wiki/final-test.patch
deleted file mode 100644
index 499ad78..0000000
--- a/doc/articles/wiki/final-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-*** final.go	2015-06-14 23:59:22.000000000 +0200
---- final-test.go	2015-06-15 00:15:41.000000000 +0200
-***************
-*** 7,12 ****
---- 7,14 ----
-  import (
-  	"html/template"
-  	"io/ioutil"
-+ 	"log"
-+ 	"net"
-  	"net/http"
-  	"regexp"
-  )
-***************
-*** 85,89 ****
-  	http.HandleFunc("/edit/", makeHandler(editHandler))
-  	http.HandleFunc("/save/", makeHandler(saveHandler))
-  
-! 	http.ListenAndServe(":8080", nil)
-  }
---- 87,101 ----
-  	http.HandleFunc("/edit/", makeHandler(editHandler))
-  	http.HandleFunc("/save/", makeHandler(saveHandler))
-  
-! 	l, err := net.Listen("tcp", "127.0.0.1:0")
-! 	if err != nil {
-! 		log.Fatal(err)
-! 	}
-! 	err = ioutil.WriteFile("final-test-port.txt", []byte(l.Addr().String()), 0644)
-! 	if err != nil {
-! 		log.Fatal(err)
-! 	}
-! 	s := &http.Server{}
-! 	s.Serve(l)
-! 	return
-  }
diff --git a/pkg/bootstrap/bin/asm b/pkg/bootstrap/bin/asm
index b7b0426..9608ff8 100755
--- a/pkg/bootstrap/bin/asm
+++ b/pkg/bootstrap/bin/asm
Binary files differ
diff --git a/pkg/bootstrap/bin/compile b/pkg/bootstrap/bin/compile
index 6b8ae27..fe71a22 100755
--- a/pkg/bootstrap/bin/compile
+++ b/pkg/bootstrap/bin/compile
Binary files differ
diff --git a/pkg/bootstrap/bin/link b/pkg/bootstrap/bin/link
index 3a8bf7d..2094a85 100755
--- a/pkg/bootstrap/bin/link
+++ b/pkg/bootstrap/bin/link
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/arch.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/arch.a
index 86e51f5..dfa4b9b 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/arch.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/arch.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/asm.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/asm.a
index 4aeb90d..564479c 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/asm.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/asm.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/flags.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/flags.a
index c3855e4..7660fcb 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/flags.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/flags.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/lex.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/lex.a
index 3517de2..0dbd726 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/lex.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/asm/internal/lex.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/amd64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/amd64.a
index 2a635ac..456aaae 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/amd64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/amd64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm.a
index 75aa399..391ca9a 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm64.a
index 2dbb4db..55746e6 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/arm64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/big.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/big.a
index 156b7bb..884b750 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/big.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/big.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/gc.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/gc.a
index b73612a..66ceceb 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/gc.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/gc.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/ppc64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/ppc64.a
index e025876..48650b7 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/ppc64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/ppc64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/x86.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/x86.a
index 69e8f34..b0948f7 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/x86.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/compile/internal/x86.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/gcprog.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/gcprog.a
index e9bd671..323982d 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/gcprog.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/gcprog.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj.a
index 4b50f97..0229031 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm.a
index b1d7a51..284d75d 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm64.a
index 39abc9d..59a0f9e 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/arm64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/ppc64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/ppc64.a
index 23ed96f..f4328c1 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/ppc64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/ppc64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/x86.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/x86.a
index f104f58..8bfe031 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/x86.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/internal/obj/x86.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/amd64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/amd64.a
index 91bdbf4..ccb106b 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/amd64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/amd64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm.a
index bbb214b..973d287 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm64.a
index 529c315..9deac7f 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/arm64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ld.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ld.a
index 1a57bd8..952d8b0 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ld.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ld.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ppc64.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ppc64.a
index 345c94a..0a8da22 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ppc64.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/ppc64.a
Binary files differ
diff --git a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/x86.a b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/x86.a
index cd5f758..6ae17cb 100644
--- a/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/x86.a
+++ b/pkg/bootstrap/pkg/darwin_amd64/bootstrap/link/internal/x86.a
Binary files differ
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arch.go b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arch.go
index b745f1c..0d4bbab 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arch.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arch.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/arch/arch.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arch.go
 
-//line /tmp/go/src/cmd/asm/internal/arch/arch.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arch.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm.go b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm.go
index 4f0039a..7453f2f 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/arch/arm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arm.go
 
-//line /tmp/go/src/cmd/asm/internal/arch/arm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arm.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm64.go b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm64.go
index 47c88e0..bdddcc8 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm64.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/arch/arm64.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/arch/arm64.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arm64.go
 
-//line /tmp/go/src/cmd/asm/internal/arch/arm64.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/arm64.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/arch/ppc64.go b/pkg/bootstrap/src/bootstrap/asm/internal/arch/ppc64.go
index 90b078d..4e2ac30 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/arch/ppc64.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/arch/ppc64.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/arch/ppc64.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/ppc64.go
 
-//line /tmp/go/src/cmd/asm/internal/arch/ppc64.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/arch/ppc64.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/asm/asm.go b/pkg/bootstrap/src/bootstrap/asm/internal/asm/asm.go
index b71e1f9..5e65620 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/asm/asm.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/asm/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/asm/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/asm.go
 
-//line /tmp/go/src/cmd/asm/internal/asm/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/asm.go:1
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/asm/endtoend_test.go b/pkg/bootstrap/src/bootstrap/asm/internal/asm/endtoend_test.go
index 7f246b0..d0e6c44 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/asm/endtoend_test.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/asm/endtoend_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/asm/endtoend_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/endtoend_test.go
 
-//line /tmp/go/src/cmd/asm/internal/asm/endtoend_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/endtoend_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/asm/expr_test.go b/pkg/bootstrap/src/bootstrap/asm/internal/asm/expr_test.go
index 420f2a7..d8fb6b0 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/asm/expr_test.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/asm/expr_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/asm/expr_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/expr_test.go
 
-//line /tmp/go/src/cmd/asm/internal/asm/expr_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/expr_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/asm/operand_test.go b/pkg/bootstrap/src/bootstrap/asm/internal/asm/operand_test.go
index 065f232..aa12f43 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/asm/operand_test.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/asm/operand_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/asm/operand_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/operand_test.go
 
-//line /tmp/go/src/cmd/asm/internal/asm/operand_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/operand_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/asm/parse.go b/pkg/bootstrap/src/bootstrap/asm/internal/asm/parse.go
index 67069d4..33f60cc 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/asm/parse.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/asm/parse.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/asm/parse.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/parse.go
 
-//line /tmp/go/src/cmd/asm/internal/asm/parse.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/asm/parse.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/flags/flags.go b/pkg/bootstrap/src/bootstrap/asm/internal/flags/flags.go
index 0ba5bba..1528c2a 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/flags/flags.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/flags/flags.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/flags/flags.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/flags/flags.go
 
-//line /tmp/go/src/cmd/asm/internal/flags/flags.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/flags/flags.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/input.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/input.go
index cd6c94b..e4d0bdd 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/input.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/input.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/input.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/input.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/input.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/input.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex.go
index 21f5342..d7a52dc 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/lex.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/lex.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/lex.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/lex.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex_test.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex_test.go
index 2804993..c9955e3 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex_test.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/lex_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/lex_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/lex_test.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/lex_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/lex_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/slice.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/slice.go
index 71ee294..9c5c8a0 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/slice.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/slice.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/slice.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/slice.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/slice.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/slice.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/stack.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/stack.go
index 281d2d4..6a0d442 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/stack.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/stack.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/stack.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/stack.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/stack.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/stack.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/internal/lex/tokenizer.go b/pkg/bootstrap/src/bootstrap/asm/internal/lex/tokenizer.go
index 7d260d3..228892c 100644
--- a/pkg/bootstrap/src/bootstrap/asm/internal/lex/tokenizer.go
+++ b/pkg/bootstrap/src/bootstrap/asm/internal/lex/tokenizer.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/internal/lex/tokenizer.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/tokenizer.go
 
-//line /tmp/go/src/cmd/asm/internal/lex/tokenizer.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/internal/lex/tokenizer.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/asm/main.go b/pkg/bootstrap/src/bootstrap/asm/main.go
index 458c11a..bf1885c 100644
--- a/pkg/bootstrap/src/bootstrap/asm/main.go
+++ b/pkg/bootstrap/src/bootstrap/asm/main.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/asm/main.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/main.go
 
-//line /tmp/go/src/cmd/asm/main.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/asm/main.go:1
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/doc.go b/pkg/bootstrap/src/bootstrap/compile/doc.go
index f7785e7..5bce1c8 100644
--- a/pkg/bootstrap/src/bootstrap/compile/doc.go
+++ b/pkg/bootstrap/src/bootstrap/compile/doc.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/doc.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/doc.go
 
-//line /tmp/go/src/cmd/compile/doc.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/doc.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/cgen.go
index 59588a6..36d1840 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/galign.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/galign.go
index e9e8509..98fc918 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/galign.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/galign.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/galign.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/galign.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/galign.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/galign.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/ggen.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/ggen.go
index cad87bb..bcef22c 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/ggen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/ggen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/ggen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/ggen.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/ggen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/ggen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/gsubr.go
index 1aff807..44b6933 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/gsubr.go:1
 // Derived from Inferno utils/6c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/peep.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/peep.go
index c98ac04..7dd6db1 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/peep.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/peep.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/peep.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/peep.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/peep.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/peep.go:1
 // Derived from Inferno utils/6c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/peep.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/prog.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/prog.go
index 598a039..5a4b77d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/prog.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/prog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/prog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/prog.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/prog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/prog.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/reg.go
index 7133b00..5744fba 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/amd64/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/amd64/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/amd64/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/amd64/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/amd64/reg.go:1
 // Derived from Inferno utils/6c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen.go
index 0714631..3f67ba1 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen64.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen64.go
index 456a4f0..12478af 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen64.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/cgen64.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/cgen64.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/cgen64.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/cgen64.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/cgen64.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/galign.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/galign.go
index 8905904..25b6915 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/galign.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/galign.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/galign.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/galign.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/galign.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/galign.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/ggen.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/ggen.go
index 7581d45..8202bed 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/ggen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/ggen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/ggen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/ggen.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/ggen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/ggen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/gsubr.go
index 8cb5726..8fb66f4 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/gsubr.go:1
 // Derived from Inferno utils/5c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/peep.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/peep.go
index 290728d..fb8f813 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/peep.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/peep.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/peep.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/peep.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/peep.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/peep.go:1
 // Inferno utils/5c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/peep.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/prog.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/prog.go
index 7dd1d2c..3df7c9a 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/prog.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/prog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/prog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/prog.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/prog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/prog.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm/reg.go
index 9fb95be..1a20233 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/arm/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm/reg.go:1
 // Inferno utils/5c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/cgen.go
index 72cbe9a..7ea4cd1 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/galign.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/galign.go
index b7f897c..f5fa073 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/galign.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/galign.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/galign.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/galign.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/galign.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/galign.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/ggen.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/ggen.go
index 6439535..eeb28b0 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/ggen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/ggen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/ggen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/ggen.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/ggen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/ggen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/gsubr.go
index cd44fa6..d128409 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/gsubr.go:1
 // Derived from Inferno utils/6c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/peep.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/peep.go
index 47cdd7b..065e0b2 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/peep.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/peep.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/peep.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/peep.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/peep.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/peep.go:1
 // Derived from Inferno utils/6c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/peep.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/prog.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/prog.go
index 97ced48..ea8a098 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/prog.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/prog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/prog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/prog.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/prog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/prog.go:1
 // Copyright 2014 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/reg.go
index 2835532..2b4f8ca 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/arm64/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/arm64/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/arm64/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/arm64/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/arm64/reg.go:1
 // Derived from Inferno utils/6c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/accuracy_string.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/accuracy_string.go
index 17ffe92..72d59b8 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/accuracy_string.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/accuracy_string.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/accuracy_string.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/accuracy_string.go
 
-//line /tmp/go/src/cmd/compile/internal/big/accuracy_string.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/accuracy_string.go:1
 // generated by stringer -type=Accuracy; DO NOT EDIT
 
 package big
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith.go
index 22f3d76..20c8f87 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/arith.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith.go
 
-//line /tmp/go/src/cmd/compile/internal/big/arith.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_decl.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_decl.go
index 2d5c42a..6df4c8e 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_decl.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_decl.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/arith_decl.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith_decl.go
 
-//line /tmp/go/src/cmd/compile/internal/big/arith_decl.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith_decl.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_test.go
index 94b8fae..4d7c7e5 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/arith_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/arith_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/arith_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/arith_test.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/bits_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/bits_test.go
index 27c33a9..0b7d60f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/bits_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/bits_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/bits_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/bits_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/bits_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/bits_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/calibrate_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/calibrate_test.go
index 771dd7e..23cc7f6 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/calibrate_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/calibrate_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/calibrate_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/calibrate_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/calibrate_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/calibrate_test.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal.go
index 85f76b1..ff58a2b 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/decimal.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/decimal.go
 
-//line /tmp/go/src/cmd/compile/internal/big/decimal.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/decimal.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal_test.go
index 501775d..71a31cc 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/decimal_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/decimal_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/decimal_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/decimal_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/decimal_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/example_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/example_test.go
index d81e2a7..ac66c7b 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/example_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/example_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/example_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/example_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/example_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/example_test.go:1
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/float.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/float.go
index 2d95661..dd8ae6b 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/float.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/float.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/float.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/float.go
 
-//line /tmp/go/src/cmd/compile/internal/big/float.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/float.go:1
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/float_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/float_test.go
index 3eaf4f5..9932412 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/float_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/float_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/float_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/float_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/float_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/float_test.go:1
 // Copyright 2014 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv.go
index f322ce0..ca1013d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/floatconv.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatconv.go
 
-//line /tmp/go/src/cmd/compile/internal/big/floatconv.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatconv.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv_test.go
index a5708ab..65ab9d9 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatconv_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/floatconv_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatconv_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/floatconv_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatconv_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatexample_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatexample_test.go
index 6950c80..2cad431 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/floatexample_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/floatexample_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/floatexample_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatexample_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/floatexample_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/floatexample_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/ftoa.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/ftoa.go
index 6eb1e13..446ecb3 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/ftoa.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/ftoa.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/ftoa.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ftoa.go
 
-//line /tmp/go/src/cmd/compile/internal/big/ftoa.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ftoa.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/gcd_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/gcd_test.go
index da8e2d6..4105c95 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/gcd_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/gcd_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/gcd_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/gcd_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/gcd_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/gcd_test.go:1
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/hilbert_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/hilbert_test.go
index 816d21d..f5b6701 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/hilbert_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/hilbert_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/hilbert_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/hilbert_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/hilbert_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/hilbert_test.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/int.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/int.go
index ef076ab..37da110 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/int.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/int.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/int.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/int.go
 
-//line /tmp/go/src/cmd/compile/internal/big/int.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/int.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/int_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/int_test.go
index be6545f..1f76442 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/int_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/int_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/int_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/int_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/int_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/int_test.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv.go
index 6561ee6..36580f6 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/intconv.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/intconv.go
 
-//line /tmp/go/src/cmd/compile/internal/big/intconv.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/intconv.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv_test.go
index c90535f..cb974e9 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/intconv_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/intconv_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/intconv_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/intconv_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/intconv_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/nat.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/nat.go
index 15ce67d..ed3313b 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/nat.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/nat.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/nat.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/nat.go
 
-//line /tmp/go/src/cmd/compile/internal/big/nat.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/nat.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/nat_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/nat_test.go
index a6ba91c..9093a9b 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/nat_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/nat_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/nat_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/nat_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/nat_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/nat_test.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv.go
index 09d5ebf..945f239 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/natconv.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/natconv.go
 
-//line /tmp/go/src/cmd/compile/internal/big/natconv.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/natconv.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv_test.go
index 7ce402b..21b4a55 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/natconv_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/natconv_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/natconv_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/natconv_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/natconv_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/rat.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/rat.go
index caf25d1..da99a2d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/rat.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/rat.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/rat.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/rat.go
 
-//line /tmp/go/src/cmd/compile/internal/big/rat.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/rat.go:1
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/rat_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/rat_test.go
index 0c61576..6cc9940 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/rat_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/rat_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/rat_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/rat_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/rat_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/rat_test.go:1
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv.go
index 6dacf3e..d6862d3 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/ratconv.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ratconv.go
 
-//line /tmp/go/src/cmd/compile/internal/big/ratconv.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ratconv.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv_test.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv_test.go
index 183c220..fc20dde 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv_test.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/ratconv_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/ratconv_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ratconv_test.go
 
-//line /tmp/go/src/cmd/compile/internal/big/ratconv_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/ratconv_test.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/roundingmode_string.go b/pkg/bootstrap/src/bootstrap/compile/internal/big/roundingmode_string.go
index 1a9a6df..09fb74a 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/roundingmode_string.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/roundingmode_string.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/roundingmode_string.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/roundingmode_string.go
 
-//line /tmp/go/src/cmd/compile/internal/big/roundingmode_string.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/roundingmode_string.go:1
 // generated by stringer -type=RoundingMode; DO NOT EDIT
 
 package big
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/big/vendor.bash b/pkg/bootstrap/src/bootstrap/compile/internal/big/vendor.bash
index d60a42f..fbf8673 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/big/vendor.bash
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/big/vendor.bash
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/big/vendor.bash
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/vendor.bash
 
-//line /tmp/go/src/cmd/compile/internal/big/vendor.bash:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/big/vendor.bash:1
 #!/usr/bin/env bash
 
 # Copyright 2015 The Go Authors.  All rights reserved.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/align.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/align.go
index 8c683d4..8518854 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/align.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/align.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/align.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/align.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/align.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/align.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/builtin.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/builtin.go
index 4517027..b6e4643 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/builtin.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/builtin.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/builtin.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/builtin.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/builtin.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/builtin.go:1
 // AUTO-GENERATED by mkbuiltin.go; DO NOT EDIT
 
 package gc
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/bv.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/bv.go
index a266587..f115cec 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/bv.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/bv.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/bv.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/bv.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/bv.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/bv.go:1
 // Copyright 2013 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/cgen.go
index 2d9fdb9..967aa28 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/closure.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/closure.go
index b6307a8..4563573 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/closure.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/closure.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/closure.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/closure.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/closure.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/closure.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/const.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/const.go
index 9ee9dc1..815423a 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/const.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/const.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/const.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/const.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/const.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/const.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/cplx.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/cplx.go
index e4f70f1..394896f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/cplx.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/cplx.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/cplx.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/cplx.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/cplx.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/cplx.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/dcl.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/dcl.go
index d9490e3..54b4929 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/dcl.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/dcl.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/dcl.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/dcl.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/dcl.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/dcl.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/esc.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/esc.go
index 1208c61..0fdce89 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/esc.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/esc.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/esc.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/esc.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/esc.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/esc.go:1
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/export.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/export.go
index 9d087bf..a48c892 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/export.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/export.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/export.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/export.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/export.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/export.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/fmt.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/fmt.go
index 5cd13e7..6507f29 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/fmt.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/fmt.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/fmt.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/fmt.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/fmt.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/fmt.go:1
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/gen.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/gen.go
index 016a82e..6cc7411 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/gen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/gen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/gen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/gen.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/gen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/gen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.go
index fb6567c..fd065d3 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/go.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/go.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/go.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/go.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.y b/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.y
index 05bff66..85a6b84 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.y
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/go.y
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/go.y
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/go.y
 
-//line /tmp/go/src/cmd/compile/internal/gc/go.y:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/go.y:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/gsubr.go
index 380e2d8..d8382a9 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/gsubr.go:1
 // Derived from Inferno utils/6c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/init.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/init.go
index 5bb6a7a..e6c4e20 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/init.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/init.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/init.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/init.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/init.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/init.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/inl.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/inl.go
index 6565db9..2bb443f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/inl.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/inl.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/inl.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/inl.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/inl.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/inl.go:1
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/lex.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/lex.go
index 1528668..110e82d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/lex.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/lex.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/lex.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/lex.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/lex.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/lex.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mkbuiltin.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mkbuiltin.go
index 0f876cf..508f15e 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mkbuiltin.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mkbuiltin.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/mkbuiltin.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mkbuiltin.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/mkbuiltin.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mkbuiltin.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith2.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith2.go
index ac8ae24..7806a6f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith2.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith2.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/mparith2.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mparith2.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/mparith2.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mparith2.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith3.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith3.go
index b05ca35..3f441be 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith3.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/mparith3.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/mparith3.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mparith3.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/mparith3.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/mparith3.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/obj.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/obj.go
index 4fd1e13..93b83c0 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/obj.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/obj.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/obj.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/opnames.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/opnames.go
index 54f1b58..bee0b2d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/opnames.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/opnames.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/opnames.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/opnames.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/opnames.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/opnames.go:1
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/order.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/order.go
index ea8e183..66ff99a 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/order.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/order.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/order.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/order.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/order.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/order.go:1
 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/pgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/pgen.go
index df72a3b..0a1f7fa 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/pgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/pgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/pgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/pgen.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/pgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/pgen.go:1
 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/plive.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/plive.go
index f897926..f32d6b3 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/plive.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/plive.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/plive.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/plive.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/plive.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/plive.go:1
 // Copyright 2013 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/popt.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/popt.go
index 705d4c2..484ffc2 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/popt.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/popt.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/popt.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/popt.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/popt.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/popt.go:1
 // Derived from Inferno utils/6c/gc.h
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/gc.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/racewalk.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/racewalk.go
index d9c48cd..2d1f0a6 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/racewalk.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/racewalk.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/racewalk.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/racewalk.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/racewalk.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/racewalk.go:1
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/range.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/range.go
index 4c2495e..692c8c9 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/range.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/range.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/range.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/range.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/range.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/range.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/reflect.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/reflect.go
index 83ecea7..c6f55ff 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/reflect.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/reflect.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/reflect.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/reflect.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/reflect.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/reflect.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/reg.go
index f2b58ca..6510e63 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/reg.go:1
 // Derived from Inferno utils/6c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/select.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/select.go
index 7e83acc..3acf23d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/select.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/select.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/select.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/select.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/select.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/select.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/sinit.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/sinit.go
index bae4ad6..d1ea58d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/sinit.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/sinit.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/sinit.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/sinit.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/sinit.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/sinit.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/subr.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/subr.go
index fc20b06..bfa4682 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/subr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/subr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/subr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/subr.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/subr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/subr.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/swt.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/swt.go
index 15e34e7..3486f74 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/swt.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/swt.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/swt.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/swt.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/swt.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/swt.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/syntax.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/syntax.go
index a93f24f..d725c73 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/syntax.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/syntax.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/syntax.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/syntax.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/syntax.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/syntax.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/typecheck.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/typecheck.go
index 859260c..684270a 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/typecheck.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/typecheck.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/typecheck.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/typecheck.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/typecheck.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/typecheck.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/unsafe.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/unsafe.go
index eb6753d..aa9feff 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/unsafe.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/unsafe.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/unsafe.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/unsafe.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/unsafe.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/unsafe.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/util.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/util.go
index 3075421..7ca596e 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/util.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/util.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/util.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/util.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/util.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/util.go:1
 package gc
 
 import (
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/walk.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/walk.go
index 9c78c8d..33f17f7 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/walk.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/walk.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/walk.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/walk.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/walk.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/walk.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/gc/y.go b/pkg/bootstrap/src/bootstrap/compile/internal/gc/y.go
index 50d0ffd..422efa0 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/gc/y.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/gc/y.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/gc/y.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/y.go
 
-//line /tmp/go/src/cmd/compile/internal/gc/y.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/gc/y.go:1
 //line go.y:21
 package gc
 
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/cgen.go
index 6152e66..58a4298 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/galign.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/galign.go
index 1ff1536..6126f9e 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/galign.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/galign.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/galign.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/galign.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/galign.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/galign.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/ggen.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/ggen.go
index c6b22db..6002b36 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/ggen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/ggen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/ggen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/ggen.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/ggen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/ggen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/gsubr.go
index 1fdf6b7..afca50f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/gsubr.go:1
 // Derived from Inferno utils/6c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/opt.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/opt.go
index 290dcbb..b343ede 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/opt.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/opt.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/opt.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/opt.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/opt.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/opt.go:1
 // Copyright 2014 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/peep.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/peep.go
index 6b189eb..9a0d6e6 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/peep.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/peep.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/peep.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/peep.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/peep.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/peep.go:1
 // Derived from Inferno utils/6c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/peep.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/prog.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/prog.go
index cb63606..71b06da 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/prog.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/prog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/prog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/prog.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/prog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/prog.go:1
 // Copyright 2014 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/reg.go
index 69abf47..faf2b8d 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/ppc64/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/ppc64/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/ppc64/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/ppc64/reg.go:1
 // Derived from Inferno utils/6c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen.go
index 2d77d21..bf36ec3 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/cgen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/cgen.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/cgen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/cgen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen64.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen64.go
index 46c473e..7c795fb 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen64.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/cgen64.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/cgen64.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/cgen64.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/cgen64.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/cgen64.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/galign.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/galign.go
index 7964da1..6da0171 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/galign.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/galign.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/galign.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/galign.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/galign.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/galign.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/ggen.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/ggen.go
index a948455..93d880f 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/ggen.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/ggen.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/ggen.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/ggen.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/ggen.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/ggen.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/gsubr.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/gsubr.go
index d621ef3..a6b72d0 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/gsubr.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/gsubr.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/gsubr.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/gsubr.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/gsubr.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/gsubr.go:1
 // Derived from Inferno utils/8c/txt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/8c/txt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/peep.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/peep.go
index a295e4a..d2b3480 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/peep.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/peep.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/peep.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/peep.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/peep.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/peep.go:1
 // Derived from Inferno utils/6c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/peep.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/prog.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/prog.go
index d55cdb6..4b1d044 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/prog.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/prog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/prog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/prog.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/prog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/prog.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/compile/internal/x86/reg.go b/pkg/bootstrap/src/bootstrap/compile/internal/x86/reg.go
index ecfd06a..47e0ff5 100644
--- a/pkg/bootstrap/src/bootstrap/compile/internal/x86/reg.go
+++ b/pkg/bootstrap/src/bootstrap/compile/internal/x86/reg.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/internal/x86/reg.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/reg.go
 
-//line /tmp/go/src/cmd/compile/internal/x86/reg.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/internal/x86/reg.go:1
 // Derived from Inferno utils/6c/reg.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/reg.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/compile/main.go b/pkg/bootstrap/src/bootstrap/compile/main.go
index e549f93..2bff576 100644
--- a/pkg/bootstrap/src/bootstrap/compile/main.go
+++ b/pkg/bootstrap/src/bootstrap/compile/main.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/compile/main.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/main.go
 
-//line /tmp/go/src/cmd/compile/main.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/compile/main.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/gcprog/gcprog.go b/pkg/bootstrap/src/bootstrap/internal/gcprog/gcprog.go
index c35b82f..1541c17 100644
--- a/pkg/bootstrap/src/bootstrap/internal/gcprog/gcprog.go
+++ b/pkg/bootstrap/src/bootstrap/internal/gcprog/gcprog.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/gcprog/gcprog.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/gcprog/gcprog.go
 
-//line /tmp/go/src/cmd/internal/gcprog/gcprog.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/gcprog/gcprog.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ar.go b/pkg/bootstrap/src/bootstrap/internal/obj/ar.go
index f38461f..11daedd 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ar.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ar.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ar.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ar.go
 
-//line /tmp/go/src/cmd/internal/obj/ar.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ar.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/a.out.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/a.out.go
index e595f89..9eebf00 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/a.out.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/a.out.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/a.out.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/a.out.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/a.out.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/a.out.go:1
 // Inferno utils/5c/5.out.h
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/5.out.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames.go
index 0afc220..13d3536 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/anames.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/anames.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/anames.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/anames.go:1
 // Generated by stringer -i a.out.go -o anames.go -p arm
 // Do not edit.
 
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames5.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames5.go
index a6d2101..a966639 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames5.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/anames5.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/anames5.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/anames5.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/anames5.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/anames5.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/asm5.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/asm5.go
index ff201d9..7b9037f 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/asm5.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/asm5.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/asm5.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/asm5.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/asm5.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/asm5.go:1
 // Inferno utils/5l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/span.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/list5.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/list5.go
index 440c478..6d26cb4 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/list5.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/list5.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/list5.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/list5.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/list5.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/list5.go:1
 // Inferno utils/5c/list.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/list.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm/obj5.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm/obj5.go
index 40a1026..ec63557 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm/obj5.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm/obj5.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm/obj5.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/obj5.go
 
-//line /tmp/go/src/cmd/internal/obj/arm/obj5.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm/obj5.go:1
 // Derived from Inferno utils/5c/swt.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/swt.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/a.out.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/a.out.go
index d22134a..0093b0b 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/a.out.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/a.out.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/a.out.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/a.out.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/a.out.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/a.out.go:1
 // cmd/7c/7.out.h  from Vita Nuova.
 // https://code.google.com/p/ken-cc/source/browse/src/cmd/7c/7.out.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames.go
index 0d9f9ba..db3c55c 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/anames.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/anames.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/anames.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/anames.go:1
 // Generated by stringer -i a.out.go -o anames.go -p arm64
 // Do not edit.
 
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames7.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames7.go
index a372d97..acd3aaa 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames7.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/anames7.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/anames7.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/anames7.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/anames7.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/anames7.go:1
 package arm64
 
 var cnames7 = []string{
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/asm7.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/asm7.go
index 24dd68a..58b5bb5 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/asm7.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/asm7.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/asm7.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/asm7.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/asm7.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/asm7.go:1
 // cmd/7l/asm.c, cmd/7l/asmout.c, cmd/7l/optab.c, cmd/7l/span.c, cmd/ld/sub.c, cmd/ld/mod.c, from Vita Nuova.
 // https://code.google.com/p/ken-cc/source/browse/
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/list7.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/list7.go
index 1e8daea..1456487 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/list7.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/list7.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/list7.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/list7.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/list7.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/list7.go:1
 // cmd/7l/list.c and cmd/7l/sub.c from Vita Nuova.
 // https://code.google.com/p/ken-cc/source/browse/
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/obj7.go b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/obj7.go
index e449a6a..35e1720 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/arm64/obj7.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/arm64/obj7.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/arm64/obj7.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/obj7.go
 
-//line /tmp/go/src/cmd/internal/obj/arm64/obj7.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/arm64/obj7.go:1
 // cmd/7l/noop.c, cmd/7l/obj.c, cmd/ld/pass.c from Vita Nuova.
 // https://code.google.com/p/ken-cc/source/browse/
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/data.go b/pkg/bootstrap/src/bootstrap/internal/obj/data.go
index b9c260b..2ac8ccc 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/data.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/data.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/data.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/data.go
 
-//line /tmp/go/src/cmd/internal/obj/data.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/data.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/flag.go b/pkg/bootstrap/src/bootstrap/internal/obj/flag.go
index 3dffdc3..6f57411 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/flag.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/flag.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/flag.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/flag.go
 
-//line /tmp/go/src/cmd/internal/obj/flag.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/flag.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/fmt.go b/pkg/bootstrap/src/bootstrap/internal/obj/fmt.go
index 0ba79d1..10e111e 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/fmt.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/fmt.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/fmt.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/fmt.go
 
-//line /tmp/go/src/cmd/internal/obj/fmt.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/fmt.go:1
 /*
  * The authors of this software are Rob Pike and Ken Thompson.
  *              Copyright (c) 2002 by Lucent Technologies.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/funcdata.go b/pkg/bootstrap/src/bootstrap/internal/obj/funcdata.go
index 7d076b5..cf7349a 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/funcdata.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/funcdata.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/funcdata.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/funcdata.go
 
-//line /tmp/go/src/cmd/internal/obj/funcdata.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/funcdata.go:1
 // Inferno utils/5c/list.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5c/list.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/go.go b/pkg/bootstrap/src/bootstrap/internal/obj/go.go
index c735b29..c85bf6b 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/go.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/go.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/go.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/go.go
 
-//line /tmp/go/src/cmd/internal/obj/go.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/go.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ld.go b/pkg/bootstrap/src/bootstrap/internal/obj/ld.go
index 6a858fa..25ef980 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ld.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ld.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ld.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ld.go
 
-//line /tmp/go/src/cmd/internal/obj/ld.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ld.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/libc.go b/pkg/bootstrap/src/bootstrap/internal/obj/libc.go
index f0ad039..5f91332 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/libc.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/libc.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/libc.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/libc.go
 
-//line /tmp/go/src/cmd/internal/obj/libc.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/libc.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/line_test.go b/pkg/bootstrap/src/bootstrap/internal/obj/line_test.go
index f8e7c8c..f949c4a 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/line_test.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/line_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/line_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/line_test.go
 
-//line /tmp/go/src/cmd/internal/obj/line_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/line_test.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/link.go b/pkg/bootstrap/src/bootstrap/internal/obj/link.go
index 86b1a03..fcf2c7a 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/link.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/link.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/link.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/link.go
 
-//line /tmp/go/src/cmd/internal/obj/link.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/link.go:1
 // Derived from Inferno utils/6l/l.h and related files.
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/l.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/mgc0.go b/pkg/bootstrap/src/bootstrap/internal/obj/mgc0.go
index bf6b2b1..3ed407e 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/mgc0.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/mgc0.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/mgc0.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/mgc0.go
 
-//line /tmp/go/src/cmd/internal/obj/mgc0.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/mgc0.go:1
 // Copyright 2013 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/obj.go b/pkg/bootstrap/src/bootstrap/internal/obj/obj.go
index 4e5a8da..b47b942 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/obj.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/obj.go
 
-//line /tmp/go/src/cmd/internal/obj/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/obj.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/objfile.go b/pkg/bootstrap/src/bootstrap/internal/obj/objfile.go
index 4897bc2..e8e4d76 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/objfile.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/objfile.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/objfile.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/objfile.go
 
-//line /tmp/go/src/cmd/internal/obj/objfile.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/objfile.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/pass.go b/pkg/bootstrap/src/bootstrap/internal/obj/pass.go
index c4b74a8..9aed177 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/pass.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/pass.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/pass.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/pass.go
 
-//line /tmp/go/src/cmd/internal/obj/pass.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/pass.go:1
 // Inferno utils/6l/pass.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/pass.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/pcln.go b/pkg/bootstrap/src/bootstrap/internal/obj/pcln.go
index 4e1f8e5..3ca1669 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/pcln.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/pcln.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/pcln.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/pcln.go
 
-//line /tmp/go/src/cmd/internal/obj/pcln.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/pcln.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/a.out.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/a.out.go
index c68e408..587f4c9 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/a.out.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/a.out.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/a.out.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/a.out.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/a.out.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/a.out.go:1
 // cmd/9c/9.out.h from Vita Nuova.
 //
 //	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames.go
index 8c7a8a2..815cfc0 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/anames.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/anames.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/anames.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/anames.go:1
 // Generated by stringer -i a.out.go -o anames.go -p ppc64
 // Do not edit.
 
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames9.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames9.go
index d4bc683..61671ef 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames9.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/anames9.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/anames9.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/anames9.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/anames9.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/anames9.go:1
 package ppc64
 
 var cnames9 = []string{
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/asm9.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/asm9.go
index e98bb27..94b54f2 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/asm9.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/asm9.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/asm9.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/asm9.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/asm9.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/asm9.go:1
 // cmd/9l/optab.c, cmd/9l/asmout.c from Vita Nuova.
 //
 //	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/list9.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/list9.go
index 9affcbf..0dbe5a0 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/list9.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/list9.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/list9.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/list9.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/list9.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/list9.go:1
 // cmd/9l/list.c from Vita Nuova.
 //
 //	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/obj9.go b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/obj9.go
index a2f155d..91b5f6e 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/obj9.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/ppc64/obj9.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/ppc64/obj9.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/obj9.go
 
-//line /tmp/go/src/cmd/internal/obj/ppc64/obj9.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/ppc64/obj9.go:1
 // cmd/9l/noop.c, cmd/9l/pass.c, cmd/9l/span.c from Vita Nuova.
 //
 //	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/stack.go b/pkg/bootstrap/src/bootstrap/internal/obj/stack.go
index 70758ad..b44ee93 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/stack.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/stack.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/stack.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/stack.go
 
-//line /tmp/go/src/cmd/internal/obj/stack.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/stack.go:1
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/stringer.go b/pkg/bootstrap/src/bootstrap/internal/obj/stringer.go
index 6ea4b85..71eb08b 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/stringer.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/stringer.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/stringer.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/stringer.go
 
-//line /tmp/go/src/cmd/internal/obj/stringer.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/stringer.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/sym.go b/pkg/bootstrap/src/bootstrap/internal/obj/sym.go
index 52e8d8d..19519c3 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/sym.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/sym.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/sym.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/sym.go
 
-//line /tmp/go/src/cmd/internal/obj/sym.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/sym.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/textflag.go b/pkg/bootstrap/src/bootstrap/internal/obj/textflag.go
index 80b2c4e..bf8e727 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/textflag.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/textflag.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/textflag.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/textflag.go
 
-//line /tmp/go/src/cmd/internal/obj/textflag.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/textflag.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/typekind.go b/pkg/bootstrap/src/bootstrap/internal/obj/typekind.go
index abacecc..4773520 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/typekind.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/typekind.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/typekind.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/typekind.go
 
-//line /tmp/go/src/cmd/internal/obj/typekind.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/typekind.go:1
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/util.go b/pkg/bootstrap/src/bootstrap/internal/obj/util.go
index a305f1f..5634a6f 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/util.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/util.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/util.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/util.go
 
-//line /tmp/go/src/cmd/internal/obj/util.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/util.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/a.out.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/a.out.go
index dbb121b..148b4da 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/a.out.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/a.out.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/a.out.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/a.out.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/a.out.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/a.out.go:1
 // Inferno utils/6c/6.out.h
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/6.out.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/anames.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/anames.go
index d2d1945..d704cc5 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/anames.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/anames.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/anames.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/anames.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/anames.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/anames.go:1
 // Generated by stringer -i a.out.go -o anames.go -p x86
 // Do not edit.
 
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/asm6.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/asm6.go
index 691d3a2..328b173 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/asm6.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/asm6.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/asm6.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/asm6.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/asm6.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/asm6.go:1
 // Inferno utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/list6.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/list6.go
index 76f5bb2..b68128b 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/list6.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/list6.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/list6.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/list6.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/list6.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/list6.go:1
 // Inferno utils/6c/list.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/list.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6.go
index a444021..3158bb2 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/obj6.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/obj6.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/obj6.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/obj6.go:1
 // Inferno utils/6l/pass.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/pass.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6_test.go b/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6_test.go
index 386117a..e2f5426 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6_test.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/x86/obj6_test.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/x86/obj6_test.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/obj6_test.go
 
-//line /tmp/go/src/cmd/internal/obj/x86/obj6_test.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/x86/obj6_test.go:1
 package x86_test
 
 import (
diff --git a/pkg/bootstrap/src/bootstrap/internal/obj/zbootstrap.go b/pkg/bootstrap/src/bootstrap/internal/obj/zbootstrap.go
index d928c68..0c45f96 100644
--- a/pkg/bootstrap/src/bootstrap/internal/obj/zbootstrap.go
+++ b/pkg/bootstrap/src/bootstrap/internal/obj/zbootstrap.go
@@ -1,13 +1,13 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/internal/obj/zbootstrap.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/zbootstrap.go
 
-//line /tmp/go/src/cmd/internal/obj/zbootstrap.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/internal/obj/zbootstrap.go:1
 // auto generated by go tool dist
 
 package obj
 
 import "runtime"
 
-const defaultGOROOT = `/tmp/go`
+const defaultGOROOT = `./prebuilts/go/darwin-x86`
 const defaultGO386 = `sse2`
 const defaultGOARM = `7`
 const defaultGOOS = runtime.GOOS
diff --git a/pkg/bootstrap/src/bootstrap/link/doc.go b/pkg/bootstrap/src/bootstrap/link/doc.go
index 78ee31b..470791d 100644
--- a/pkg/bootstrap/src/bootstrap/link/doc.go
+++ b/pkg/bootstrap/src/bootstrap/link/doc.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/doc.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/doc.go
 
-//line /tmp/go/src/cmd/link/doc.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/doc.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/amd64/asm.go b/pkg/bootstrap/src/bootstrap/link/internal/amd64/asm.go
index ce86d8a..3fe0192 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/amd64/asm.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/amd64/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/amd64/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/asm.go
 
-//line /tmp/go/src/cmd/link/internal/amd64/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/asm.go:1
 // Inferno utils/6l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/amd64/l.go b/pkg/bootstrap/src/bootstrap/link/internal/amd64/l.go
index 4239d81..351c6af 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/amd64/l.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/amd64/l.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/amd64/l.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/l.go
 
-//line /tmp/go/src/cmd/link/internal/amd64/l.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/l.go:1
 // Inferno utils/6l/l.h
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/l.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/amd64/obj.go b/pkg/bootstrap/src/bootstrap/link/internal/amd64/obj.go
index bb995d6..b407188 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/amd64/obj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/amd64/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/amd64/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/obj.go
 
-//line /tmp/go/src/cmd/link/internal/amd64/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/obj.go:1
 // Inferno utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/amd64/z.go b/pkg/bootstrap/src/bootstrap/link/internal/amd64/z.go
index e61c4d3..b4f95e7 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/amd64/z.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/amd64/z.go
@@ -1,4 +1,4 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/amd64/z.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/z.go
 
-//line /tmp/go/src/cmd/link/internal/amd64/z.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/amd64/z.go:1
 package amd64
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm/asm.go b/pkg/bootstrap/src/bootstrap/link/internal/arm/asm.go
index 594e6b2..61572af 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm/asm.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/asm.go
 
-//line /tmp/go/src/cmd/link/internal/arm/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/asm.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm/l.go b/pkg/bootstrap/src/bootstrap/link/internal/arm/l.go
index 6a0b4a6..daae968 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm/l.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm/l.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm/l.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/l.go
 
-//line /tmp/go/src/cmd/link/internal/arm/l.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/l.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm/obj.go b/pkg/bootstrap/src/bootstrap/link/internal/arm/obj.go
index ae22fcf..6280d3e 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm/obj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/obj.go
 
-//line /tmp/go/src/cmd/link/internal/arm/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm/obj.go:1
 // Inferno utils/5l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm64/asm.go b/pkg/bootstrap/src/bootstrap/link/internal/arm64/asm.go
index 8ee2434..a789f4b 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm64/asm.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm64/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm64/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/asm.go
 
-//line /tmp/go/src/cmd/link/internal/arm64/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/asm.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm64/l.go b/pkg/bootstrap/src/bootstrap/link/internal/arm64/l.go
index ab399f7..e7d2085 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm64/l.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm64/l.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm64/l.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/l.go
 
-//line /tmp/go/src/cmd/link/internal/arm64/l.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/l.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/arm64/obj.go b/pkg/bootstrap/src/bootstrap/link/internal/arm64/obj.go
index fa90c29..57130c9 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/arm64/obj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/arm64/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/arm64/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/obj.go
 
-//line /tmp/go/src/cmd/link/internal/arm64/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/arm64/obj.go:1
 // Inferno utils/5l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/ar.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/ar.go
index c1a447f..d768803 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/ar.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/ar.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/ar.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ar.go
 
-//line /tmp/go/src/cmd/link/internal/ld/ar.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ar.go:1
 // Inferno utils/include/ar.h
 // http://code.google.com/p/inferno-os/source/browse/utils/include/ar.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/arch.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/arch.go
index b953aae..c54e34b 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/arch.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/arch.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/arch.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/arch.go
 
-//line /tmp/go/src/cmd/link/internal/ld/arch.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/arch.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/data.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/data.go
index 2950b70..3f1a58c 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/data.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/data.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/data.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/data.go
 
-//line /tmp/go/src/cmd/link/internal/ld/data.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/data.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/decodesym.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/decodesym.go
index 284f8b1..d9d5e52 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/decodesym.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/decodesym.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/decodesym.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/decodesym.go
 
-//line /tmp/go/src/cmd/link/internal/ld/decodesym.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/decodesym.go:1
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf.go
index b62ce5e..c77416c 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/dwarf.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/dwarf.go
 
-//line /tmp/go/src/cmd/link/internal/ld/dwarf.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/dwarf.go:1
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf_defs.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf_defs.go
index 8b90114..739ad6e 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf_defs.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/dwarf_defs.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/dwarf_defs.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/dwarf_defs.go
 
-//line /tmp/go/src/cmd/link/internal/ld/dwarf_defs.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/dwarf_defs.go:1
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/elf.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/elf.go
index 3684f07..8c19529 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/elf.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/elf.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/elf.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/elf.go
 
-//line /tmp/go/src/cmd/link/internal/ld/elf.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/elf.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/go.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/go.go
index cc2dc41..99dd163 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/go.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/go.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/go.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/go.go
 
-//line /tmp/go/src/cmd/link/internal/ld/go.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/go.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/ld.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/ld.go
index 39192a6..83b7c1d 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/ld.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/ld.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/ld.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ld.go
 
-//line /tmp/go/src/cmd/link/internal/ld/ld.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ld.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldelf.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldelf.go
index cba2d83..398f75e 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldelf.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldelf.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/ldelf.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldelf.go
 
-//line /tmp/go/src/cmd/link/internal/ld/ldelf.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldelf.go:1
 package ld
 
 import (
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldmacho.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldmacho.go
index 2fc7369..8944b90 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldmacho.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldmacho.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/ldmacho.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldmacho.go
 
-//line /tmp/go/src/cmd/link/internal/ld/ldmacho.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldmacho.go:1
 package ld
 
 import (
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldpe.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldpe.go
index c9890ef..040cd03 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/ldpe.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/ldpe.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/ldpe.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldpe.go
 
-//line /tmp/go/src/cmd/link/internal/ld/ldpe.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/ldpe.go:1
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/lib.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/lib.go
index 370d63c..e9bc277 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/lib.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/lib.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/lib.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/lib.go
 
-//line /tmp/go/src/cmd/link/internal/ld/lib.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/lib.go:1
 // Inferno utils/8l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/8l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/link.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/link.go
index ac473ce..d4b2b0b 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/link.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/link.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/link.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/link.go
 
-//line /tmp/go/src/cmd/link/internal/ld/link.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/link.go:1
 // Derived from Inferno utils/6l/l.h and related files.
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/l.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/macho.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/macho.go
index c53463f..e31c891 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/macho.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/macho.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/macho.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/macho.go
 
-//line /tmp/go/src/cmd/link/internal/ld/macho.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/macho.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/macho_combine_dwarf.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/macho_combine_dwarf.go
index ffe925d..52bff28 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/macho_combine_dwarf.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/macho_combine_dwarf.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/macho_combine_dwarf.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/macho_combine_dwarf.go
 
-//line /tmp/go/src/cmd/link/internal/ld/macho_combine_dwarf.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/macho_combine_dwarf.go:1
 // Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/objfile.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/objfile.go
index 74af8c2..8e77aa0 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/objfile.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/objfile.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/objfile.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/objfile.go
 
-//line /tmp/go/src/cmd/link/internal/ld/objfile.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/objfile.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/pcln.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/pcln.go
index 87d4467..1c396bf 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/pcln.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/pcln.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/pcln.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pcln.go
 
-//line /tmp/go/src/cmd/link/internal/ld/pcln.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pcln.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/pe.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/pe.go
index 5e11bff..c399ebd 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/pe.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/pe.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/pe.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pe.go
 
-//line /tmp/go/src/cmd/link/internal/ld/pe.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pe.go:1
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/pobj.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/pobj.go
index 93508fd..a9176c6 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/pobj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/pobj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/pobj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pobj.go
 
-//line /tmp/go/src/cmd/link/internal/ld/pobj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/pobj.go:1
 // Inferno utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/sym.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/sym.go
index ff8ee09..777eb37 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/sym.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/sym.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/sym.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/sym.go
 
-//line /tmp/go/src/cmd/link/internal/ld/sym.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/sym.go:1
 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/symtab.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/symtab.go
index fd8d63a..590dd9e 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/symtab.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/symtab.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/symtab.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/symtab.go
 
-//line /tmp/go/src/cmd/link/internal/ld/symtab.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/symtab.go:1
 // Inferno utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/textflag.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/textflag.go
index 05d25b4..330fd7a 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/textflag.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/textflag.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/textflag.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/textflag.go
 
-//line /tmp/go/src/cmd/link/internal/ld/textflag.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/textflag.go:1
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ld/util.go b/pkg/bootstrap/src/bootstrap/link/internal/ld/util.go
index a675008..fbfa7e6 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ld/util.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ld/util.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ld/util.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/util.go
 
-//line /tmp/go/src/cmd/link/internal/ld/util.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ld/util.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/asm.go b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/asm.go
index bf78297..f754052 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/asm.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ppc64/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/asm.go
 
-//line /tmp/go/src/cmd/link/internal/ppc64/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/asm.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/l.go b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/l.go
index ce56b95..a4ecb93 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/l.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/l.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ppc64/l.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/l.go
 
-//line /tmp/go/src/cmd/link/internal/ppc64/l.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/l.go:1
 // Inferno utils/5l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/obj.go b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/obj.go
index 3985a82..6307045 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/ppc64/obj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/ppc64/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/ppc64/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/obj.go
 
-//line /tmp/go/src/cmd/link/internal/ppc64/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/ppc64/obj.go:1
 // Inferno utils/5l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/x86/asm.go b/pkg/bootstrap/src/bootstrap/link/internal/x86/asm.go
index 8f74be3..974cd51 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/x86/asm.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/x86/asm.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/x86/asm.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/asm.go
 
-//line /tmp/go/src/cmd/link/internal/x86/asm.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/asm.go:1
 // Inferno utils/8l/asm.c
 // http://code.google.com/p/inferno-os/source/browse/utils/8l/asm.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/x86/l.go b/pkg/bootstrap/src/bootstrap/link/internal/x86/l.go
index 45733dc..a8d6207 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/x86/l.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/x86/l.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/x86/l.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/l.go
 
-//line /tmp/go/src/cmd/link/internal/x86/l.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/l.go:1
 // Inferno utils/8l/l.h
 // http://code.google.com/p/inferno-os/source/browse/utils/8l/l.h
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/internal/x86/obj.go b/pkg/bootstrap/src/bootstrap/link/internal/x86/obj.go
index 7243247..4cfe74f 100644
--- a/pkg/bootstrap/src/bootstrap/link/internal/x86/obj.go
+++ b/pkg/bootstrap/src/bootstrap/link/internal/x86/obj.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/internal/x86/obj.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/obj.go
 
-//line /tmp/go/src/cmd/link/internal/x86/obj.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/internal/x86/obj.go:1
 // Inferno utils/8l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/8l/obj.c
 //
diff --git a/pkg/bootstrap/src/bootstrap/link/main.go b/pkg/bootstrap/src/bootstrap/link/main.go
index 486b92a..65276c1 100644
--- a/pkg/bootstrap/src/bootstrap/link/main.go
+++ b/pkg/bootstrap/src/bootstrap/link/main.go
@@ -1,6 +1,6 @@
-// Do not edit. Bootstrap copy of /tmp/go/src/cmd/link/main.go
+// Do not edit. Bootstrap copy of /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/main.go
 
-//line /tmp/go/src/cmd/link/main.go:1
+//line /Volumes/Android/buildbot/src/android/build-tools/out/obj/go/src/cmd/link/main.go:1
 // Copyright 2015 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
diff --git a/pkg/darwin_amd64/archive/tar.a b/pkg/darwin_amd64/archive/tar.a
index 6c24ea8..ac572d6 100644
--- a/pkg/darwin_amd64/archive/tar.a
+++ b/pkg/darwin_amd64/archive/tar.a
Binary files differ
diff --git a/pkg/darwin_amd64/archive/zip.a b/pkg/darwin_amd64/archive/zip.a
index f6ff4d3..4fc26b4 100644
--- a/pkg/darwin_amd64/archive/zip.a
+++ b/pkg/darwin_amd64/archive/zip.a
Binary files differ
diff --git a/pkg/darwin_amd64/bufio.a b/pkg/darwin_amd64/bufio.a
index 69ef333..c6711d4 100644
--- a/pkg/darwin_amd64/bufio.a
+++ b/pkg/darwin_amd64/bufio.a
Binary files differ
diff --git a/pkg/darwin_amd64/bytes.a b/pkg/darwin_amd64/bytes.a
index 1418363..109703c 100644
--- a/pkg/darwin_amd64/bytes.a
+++ b/pkg/darwin_amd64/bytes.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/asm/internal/arch.a b/pkg/darwin_amd64/cmd/asm/internal/arch.a
index 32a0e64..ab03d57 100644
--- a/pkg/darwin_amd64/cmd/asm/internal/arch.a
+++ b/pkg/darwin_amd64/cmd/asm/internal/arch.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/asm/internal/asm.a b/pkg/darwin_amd64/cmd/asm/internal/asm.a
index 898a923..3c14cea 100644
--- a/pkg/darwin_amd64/cmd/asm/internal/asm.a
+++ b/pkg/darwin_amd64/cmd/asm/internal/asm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/asm/internal/flags.a b/pkg/darwin_amd64/cmd/asm/internal/flags.a
index fb02fae..c8da051 100644
--- a/pkg/darwin_amd64/cmd/asm/internal/flags.a
+++ b/pkg/darwin_amd64/cmd/asm/internal/flags.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/asm/internal/lex.a b/pkg/darwin_amd64/cmd/asm/internal/lex.a
index d7d5cd9..2e4cedc 100644
--- a/pkg/darwin_amd64/cmd/asm/internal/lex.a
+++ b/pkg/darwin_amd64/cmd/asm/internal/lex.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/amd64.a b/pkg/darwin_amd64/cmd/compile/internal/amd64.a
index ad941f5..6be0fbf 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/amd64.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/amd64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/arm.a b/pkg/darwin_amd64/cmd/compile/internal/arm.a
index fec49a3..3b22fe0 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/arm.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/arm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/arm64.a b/pkg/darwin_amd64/cmd/compile/internal/arm64.a
index b9cd1bf..a241790 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/arm64.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/arm64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/big.a b/pkg/darwin_amd64/cmd/compile/internal/big.a
index 0820c8f..4a60d59 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/big.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/big.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/gc.a b/pkg/darwin_amd64/cmd/compile/internal/gc.a
index e4a3cb4..dd80c15 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/gc.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/gc.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/ppc64.a b/pkg/darwin_amd64/cmd/compile/internal/ppc64.a
index e722868..cf11dc2 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/ppc64.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/ppc64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/compile/internal/x86.a b/pkg/darwin_amd64/cmd/compile/internal/x86.a
index 8b8a912..fb7bec8 100644
--- a/pkg/darwin_amd64/cmd/compile/internal/x86.a
+++ b/pkg/darwin_amd64/cmd/compile/internal/x86.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/gcprog.a b/pkg/darwin_amd64/cmd/internal/gcprog.a
index 42819d6..8998a6f 100644
--- a/pkg/darwin_amd64/cmd/internal/gcprog.a
+++ b/pkg/darwin_amd64/cmd/internal/gcprog.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/goobj.a b/pkg/darwin_amd64/cmd/internal/goobj.a
index c8766ca..e043f9c 100644
--- a/pkg/darwin_amd64/cmd/internal/goobj.a
+++ b/pkg/darwin_amd64/cmd/internal/goobj.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/obj.a b/pkg/darwin_amd64/cmd/internal/obj.a
index 9a64ed5..fc968c5 100644
--- a/pkg/darwin_amd64/cmd/internal/obj.a
+++ b/pkg/darwin_amd64/cmd/internal/obj.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/obj/arm.a b/pkg/darwin_amd64/cmd/internal/obj/arm.a
index 865f097..99348de 100644
--- a/pkg/darwin_amd64/cmd/internal/obj/arm.a
+++ b/pkg/darwin_amd64/cmd/internal/obj/arm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/obj/arm64.a b/pkg/darwin_amd64/cmd/internal/obj/arm64.a
index 7222f09..341d45c 100644
--- a/pkg/darwin_amd64/cmd/internal/obj/arm64.a
+++ b/pkg/darwin_amd64/cmd/internal/obj/arm64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/obj/ppc64.a b/pkg/darwin_amd64/cmd/internal/obj/ppc64.a
index 732f06d..cad54fa 100644
--- a/pkg/darwin_amd64/cmd/internal/obj/ppc64.a
+++ b/pkg/darwin_amd64/cmd/internal/obj/ppc64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/obj/x86.a b/pkg/darwin_amd64/cmd/internal/obj/x86.a
index 5f22955..415e63e 100644
--- a/pkg/darwin_amd64/cmd/internal/obj/x86.a
+++ b/pkg/darwin_amd64/cmd/internal/obj/x86.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/objfile.a b/pkg/darwin_amd64/cmd/internal/objfile.a
index a150325..012d951 100644
--- a/pkg/darwin_amd64/cmd/internal/objfile.a
+++ b/pkg/darwin_amd64/cmd/internal/objfile.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/rsc.io/arm/armasm.a b/pkg/darwin_amd64/cmd/internal/rsc.io/arm/armasm.a
index df4f943..2c4de9e 100644
--- a/pkg/darwin_amd64/cmd/internal/rsc.io/arm/armasm.a
+++ b/pkg/darwin_amd64/cmd/internal/rsc.io/arm/armasm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/internal/rsc.io/x86/x86asm.a b/pkg/darwin_amd64/cmd/internal/rsc.io/x86/x86asm.a
index 591860a..bba7225 100644
--- a/pkg/darwin_amd64/cmd/internal/rsc.io/x86/x86asm.a
+++ b/pkg/darwin_amd64/cmd/internal/rsc.io/x86/x86asm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/amd64.a b/pkg/darwin_amd64/cmd/link/internal/amd64.a
index 17c3f1b..6708ef8 100644
--- a/pkg/darwin_amd64/cmd/link/internal/amd64.a
+++ b/pkg/darwin_amd64/cmd/link/internal/amd64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/arm.a b/pkg/darwin_amd64/cmd/link/internal/arm.a
index 3dfa9b8..0914c99 100644
--- a/pkg/darwin_amd64/cmd/link/internal/arm.a
+++ b/pkg/darwin_amd64/cmd/link/internal/arm.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/arm64.a b/pkg/darwin_amd64/cmd/link/internal/arm64.a
index 223968a..6fb8b39 100644
--- a/pkg/darwin_amd64/cmd/link/internal/arm64.a
+++ b/pkg/darwin_amd64/cmd/link/internal/arm64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/ld.a b/pkg/darwin_amd64/cmd/link/internal/ld.a
index b40aaca..524f94d 100644
--- a/pkg/darwin_amd64/cmd/link/internal/ld.a
+++ b/pkg/darwin_amd64/cmd/link/internal/ld.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/ppc64.a b/pkg/darwin_amd64/cmd/link/internal/ppc64.a
index 60d7c46..6f87ea0 100644
--- a/pkg/darwin_amd64/cmd/link/internal/ppc64.a
+++ b/pkg/darwin_amd64/cmd/link/internal/ppc64.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/link/internal/x86.a b/pkg/darwin_amd64/cmd/link/internal/x86.a
index 8d5c53e..cbcccf4 100644
--- a/pkg/darwin_amd64/cmd/link/internal/x86.a
+++ b/pkg/darwin_amd64/cmd/link/internal/x86.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/commands.a b/pkg/darwin_amd64/cmd/pprof/internal/commands.a
index 4dd329e..c7cf6b3 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/commands.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/commands.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/driver.a b/pkg/darwin_amd64/cmd/pprof/internal/driver.a
index 96ae977..c46d5dd 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/driver.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/driver.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/fetch.a b/pkg/darwin_amd64/cmd/pprof/internal/fetch.a
index aa166fc..eded35c 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/fetch.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/fetch.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/plugin.a b/pkg/darwin_amd64/cmd/pprof/internal/plugin.a
index 6b5b046..3b092a5 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/plugin.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/plugin.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/profile.a b/pkg/darwin_amd64/cmd/pprof/internal/profile.a
index 919dfc8..385b49b 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/profile.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/profile.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/report.a b/pkg/darwin_amd64/cmd/pprof/internal/report.a
index 2df91b9..5ccce11 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/report.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/report.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/svg.a b/pkg/darwin_amd64/cmd/pprof/internal/svg.a
index 0ad2aa2..bc08414 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/svg.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/svg.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/symbolizer.a b/pkg/darwin_amd64/cmd/pprof/internal/symbolizer.a
index 1162e51..fdf87da 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/symbolizer.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/symbolizer.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/symbolz.a b/pkg/darwin_amd64/cmd/pprof/internal/symbolz.a
index fc82a03..6c94912 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/symbolz.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/symbolz.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/pprof/internal/tempfile.a b/pkg/darwin_amd64/cmd/pprof/internal/tempfile.a
index 5d18f58..9d37204 100644
--- a/pkg/darwin_amd64/cmd/pprof/internal/tempfile.a
+++ b/pkg/darwin_amd64/cmd/pprof/internal/tempfile.a
Binary files differ
diff --git a/pkg/darwin_amd64/cmd/vet/whitelist.a b/pkg/darwin_amd64/cmd/vet/whitelist.a
index 468d01d..64156a4 100644
--- a/pkg/darwin_amd64/cmd/vet/whitelist.a
+++ b/pkg/darwin_amd64/cmd/vet/whitelist.a
Binary files differ
diff --git a/pkg/darwin_amd64/compress/bzip2.a b/pkg/darwin_amd64/compress/bzip2.a
index 8b8df44..44eb2a3 100644
--- a/pkg/darwin_amd64/compress/bzip2.a
+++ b/pkg/darwin_amd64/compress/bzip2.a
Binary files differ
diff --git a/pkg/darwin_amd64/compress/flate.a b/pkg/darwin_amd64/compress/flate.a
index f30d9b9..5534310 100644
--- a/pkg/darwin_amd64/compress/flate.a
+++ b/pkg/darwin_amd64/compress/flate.a
Binary files differ
diff --git a/pkg/darwin_amd64/compress/gzip.a b/pkg/darwin_amd64/compress/gzip.a
index 7364959..7e9f2c9 100644
--- a/pkg/darwin_amd64/compress/gzip.a
+++ b/pkg/darwin_amd64/compress/gzip.a
Binary files differ
diff --git a/pkg/darwin_amd64/compress/lzw.a b/pkg/darwin_amd64/compress/lzw.a
index e67e00b..39d8fdc 100644
--- a/pkg/darwin_amd64/compress/lzw.a
+++ b/pkg/darwin_amd64/compress/lzw.a
Binary files differ
diff --git a/pkg/darwin_amd64/compress/zlib.a b/pkg/darwin_amd64/compress/zlib.a
index c021850..0718818 100644
--- a/pkg/darwin_amd64/compress/zlib.a
+++ b/pkg/darwin_amd64/compress/zlib.a
Binary files differ
diff --git a/pkg/darwin_amd64/container/heap.a b/pkg/darwin_amd64/container/heap.a
index 64bae49..a9ec108 100644
--- a/pkg/darwin_amd64/container/heap.a
+++ b/pkg/darwin_amd64/container/heap.a
Binary files differ
diff --git a/pkg/darwin_amd64/container/list.a b/pkg/darwin_amd64/container/list.a
index 6b3c3f3..ff851dd 100644
--- a/pkg/darwin_amd64/container/list.a
+++ b/pkg/darwin_amd64/container/list.a
Binary files differ
diff --git a/pkg/darwin_amd64/container/ring.a b/pkg/darwin_amd64/container/ring.a
index fbce689..67a50be 100644
--- a/pkg/darwin_amd64/container/ring.a
+++ b/pkg/darwin_amd64/container/ring.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto.a b/pkg/darwin_amd64/crypto.a
index 45282fa..266b8fe 100644
--- a/pkg/darwin_amd64/crypto.a
+++ b/pkg/darwin_amd64/crypto.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/aes.a b/pkg/darwin_amd64/crypto/aes.a
index b6dd519..9031511 100644
--- a/pkg/darwin_amd64/crypto/aes.a
+++ b/pkg/darwin_amd64/crypto/aes.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/cipher.a b/pkg/darwin_amd64/crypto/cipher.a
index e1aa600..f636cf8 100644
--- a/pkg/darwin_amd64/crypto/cipher.a
+++ b/pkg/darwin_amd64/crypto/cipher.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/des.a b/pkg/darwin_amd64/crypto/des.a
index 88a1356..365780b 100644
--- a/pkg/darwin_amd64/crypto/des.a
+++ b/pkg/darwin_amd64/crypto/des.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/dsa.a b/pkg/darwin_amd64/crypto/dsa.a
index c649a8d..fb7b9c4 100644
--- a/pkg/darwin_amd64/crypto/dsa.a
+++ b/pkg/darwin_amd64/crypto/dsa.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/ecdsa.a b/pkg/darwin_amd64/crypto/ecdsa.a
index bc55fb8..c6f79f8 100644
--- a/pkg/darwin_amd64/crypto/ecdsa.a
+++ b/pkg/darwin_amd64/crypto/ecdsa.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/elliptic.a b/pkg/darwin_amd64/crypto/elliptic.a
index 6e20385..c8383d9 100644
--- a/pkg/darwin_amd64/crypto/elliptic.a
+++ b/pkg/darwin_amd64/crypto/elliptic.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/hmac.a b/pkg/darwin_amd64/crypto/hmac.a
index e664684..ec8a78a 100644
--- a/pkg/darwin_amd64/crypto/hmac.a
+++ b/pkg/darwin_amd64/crypto/hmac.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/md5.a b/pkg/darwin_amd64/crypto/md5.a
index c937969..9f75640 100644
--- a/pkg/darwin_amd64/crypto/md5.a
+++ b/pkg/darwin_amd64/crypto/md5.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/rand.a b/pkg/darwin_amd64/crypto/rand.a
index 784cea5..c9c255d 100644
--- a/pkg/darwin_amd64/crypto/rand.a
+++ b/pkg/darwin_amd64/crypto/rand.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/rc4.a b/pkg/darwin_amd64/crypto/rc4.a
index ed93adb..ad6c6ef 100644
--- a/pkg/darwin_amd64/crypto/rc4.a
+++ b/pkg/darwin_amd64/crypto/rc4.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/rsa.a b/pkg/darwin_amd64/crypto/rsa.a
index 304586e..8a95719 100644
--- a/pkg/darwin_amd64/crypto/rsa.a
+++ b/pkg/darwin_amd64/crypto/rsa.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/sha1.a b/pkg/darwin_amd64/crypto/sha1.a
index 18695e6..bf16f87 100644
--- a/pkg/darwin_amd64/crypto/sha1.a
+++ b/pkg/darwin_amd64/crypto/sha1.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/sha256.a b/pkg/darwin_amd64/crypto/sha256.a
index e8965e7..ac92d33 100644
--- a/pkg/darwin_amd64/crypto/sha256.a
+++ b/pkg/darwin_amd64/crypto/sha256.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/sha512.a b/pkg/darwin_amd64/crypto/sha512.a
index 96df7a8..0c63e93 100644
--- a/pkg/darwin_amd64/crypto/sha512.a
+++ b/pkg/darwin_amd64/crypto/sha512.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/subtle.a b/pkg/darwin_amd64/crypto/subtle.a
index 1c151bf..1f0a56f 100644
--- a/pkg/darwin_amd64/crypto/subtle.a
+++ b/pkg/darwin_amd64/crypto/subtle.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/tls.a b/pkg/darwin_amd64/crypto/tls.a
index b14ce4e..157b2c5 100644
--- a/pkg/darwin_amd64/crypto/tls.a
+++ b/pkg/darwin_amd64/crypto/tls.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/x509.a b/pkg/darwin_amd64/crypto/x509.a
index f175ceb..7657091 100644
--- a/pkg/darwin_amd64/crypto/x509.a
+++ b/pkg/darwin_amd64/crypto/x509.a
Binary files differ
diff --git a/pkg/darwin_amd64/crypto/x509/pkix.a b/pkg/darwin_amd64/crypto/x509/pkix.a
index c0ae200..aa1b0fb 100644
--- a/pkg/darwin_amd64/crypto/x509/pkix.a
+++ b/pkg/darwin_amd64/crypto/x509/pkix.a
Binary files differ
diff --git a/pkg/darwin_amd64/database/sql.a b/pkg/darwin_amd64/database/sql.a
index e77a0b1..ae15795 100644
--- a/pkg/darwin_amd64/database/sql.a
+++ b/pkg/darwin_amd64/database/sql.a
Binary files differ
diff --git a/pkg/darwin_amd64/database/sql/driver.a b/pkg/darwin_amd64/database/sql/driver.a
index e09a1cb..bcf82f9 100644
--- a/pkg/darwin_amd64/database/sql/driver.a
+++ b/pkg/darwin_amd64/database/sql/driver.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/dwarf.a b/pkg/darwin_amd64/debug/dwarf.a
index 15203bf..a007388 100644
--- a/pkg/darwin_amd64/debug/dwarf.a
+++ b/pkg/darwin_amd64/debug/dwarf.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/elf.a b/pkg/darwin_amd64/debug/elf.a
index d3e5cbc..e0577c1 100644
--- a/pkg/darwin_amd64/debug/elf.a
+++ b/pkg/darwin_amd64/debug/elf.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/gosym.a b/pkg/darwin_amd64/debug/gosym.a
index 51cbbf1..27128be 100644
--- a/pkg/darwin_amd64/debug/gosym.a
+++ b/pkg/darwin_amd64/debug/gosym.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/macho.a b/pkg/darwin_amd64/debug/macho.a
index 0ed5026..a3f2cbb 100644
--- a/pkg/darwin_amd64/debug/macho.a
+++ b/pkg/darwin_amd64/debug/macho.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/pe.a b/pkg/darwin_amd64/debug/pe.a
index 63edd12..8f5792e 100644
--- a/pkg/darwin_amd64/debug/pe.a
+++ b/pkg/darwin_amd64/debug/pe.a
Binary files differ
diff --git a/pkg/darwin_amd64/debug/plan9obj.a b/pkg/darwin_amd64/debug/plan9obj.a
index 92702c9..58449fe 100644
--- a/pkg/darwin_amd64/debug/plan9obj.a
+++ b/pkg/darwin_amd64/debug/plan9obj.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding.a b/pkg/darwin_amd64/encoding.a
index 2a0dee4..5255f78 100644
--- a/pkg/darwin_amd64/encoding.a
+++ b/pkg/darwin_amd64/encoding.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/ascii85.a b/pkg/darwin_amd64/encoding/ascii85.a
index cec59db..36c8362 100644
--- a/pkg/darwin_amd64/encoding/ascii85.a
+++ b/pkg/darwin_amd64/encoding/ascii85.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/asn1.a b/pkg/darwin_amd64/encoding/asn1.a
index 3766461..76b63ad 100644
--- a/pkg/darwin_amd64/encoding/asn1.a
+++ b/pkg/darwin_amd64/encoding/asn1.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/base32.a b/pkg/darwin_amd64/encoding/base32.a
index b029c41..6af8b0b 100644
--- a/pkg/darwin_amd64/encoding/base32.a
+++ b/pkg/darwin_amd64/encoding/base32.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/base64.a b/pkg/darwin_amd64/encoding/base64.a
index 8225c11..d3000fb 100644
--- a/pkg/darwin_amd64/encoding/base64.a
+++ b/pkg/darwin_amd64/encoding/base64.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/binary.a b/pkg/darwin_amd64/encoding/binary.a
index faba4ce..5aaf9c8 100644
--- a/pkg/darwin_amd64/encoding/binary.a
+++ b/pkg/darwin_amd64/encoding/binary.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/csv.a b/pkg/darwin_amd64/encoding/csv.a
index 662d908..7b03445 100644
--- a/pkg/darwin_amd64/encoding/csv.a
+++ b/pkg/darwin_amd64/encoding/csv.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/gob.a b/pkg/darwin_amd64/encoding/gob.a
index cdb47f7..87980ef 100644
--- a/pkg/darwin_amd64/encoding/gob.a
+++ b/pkg/darwin_amd64/encoding/gob.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/hex.a b/pkg/darwin_amd64/encoding/hex.a
index 44ef5f2..17d6775 100644
--- a/pkg/darwin_amd64/encoding/hex.a
+++ b/pkg/darwin_amd64/encoding/hex.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/json.a b/pkg/darwin_amd64/encoding/json.a
index efb24c0..b836873 100644
--- a/pkg/darwin_amd64/encoding/json.a
+++ b/pkg/darwin_amd64/encoding/json.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/pem.a b/pkg/darwin_amd64/encoding/pem.a
index a9d0340..b9acb51 100644
--- a/pkg/darwin_amd64/encoding/pem.a
+++ b/pkg/darwin_amd64/encoding/pem.a
Binary files differ
diff --git a/pkg/darwin_amd64/encoding/xml.a b/pkg/darwin_amd64/encoding/xml.a
index 559dd15..9d02ea4 100644
--- a/pkg/darwin_amd64/encoding/xml.a
+++ b/pkg/darwin_amd64/encoding/xml.a
Binary files differ
diff --git a/pkg/darwin_amd64/errors.a b/pkg/darwin_amd64/errors.a
index c9808b1..f7c5cde 100644
--- a/pkg/darwin_amd64/errors.a
+++ b/pkg/darwin_amd64/errors.a
Binary files differ
diff --git a/pkg/darwin_amd64/expvar.a b/pkg/darwin_amd64/expvar.a
index b6c9ca1..a1aadf7 100644
--- a/pkg/darwin_amd64/expvar.a
+++ b/pkg/darwin_amd64/expvar.a
Binary files differ
diff --git a/pkg/darwin_amd64/flag.a b/pkg/darwin_amd64/flag.a
index 6fabe52..5f0bb8e 100644
--- a/pkg/darwin_amd64/flag.a
+++ b/pkg/darwin_amd64/flag.a
Binary files differ
diff --git a/pkg/darwin_amd64/fmt.a b/pkg/darwin_amd64/fmt.a
index ddb2237..3b66770 100644
--- a/pkg/darwin_amd64/fmt.a
+++ b/pkg/darwin_amd64/fmt.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/ast.a b/pkg/darwin_amd64/go/ast.a
index 1d1c495..bf5e708 100644
--- a/pkg/darwin_amd64/go/ast.a
+++ b/pkg/darwin_amd64/go/ast.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/build.a b/pkg/darwin_amd64/go/build.a
index 95cd096..f337d66 100644
--- a/pkg/darwin_amd64/go/build.a
+++ b/pkg/darwin_amd64/go/build.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/constant.a b/pkg/darwin_amd64/go/constant.a
index 04dea64..c682149 100644
--- a/pkg/darwin_amd64/go/constant.a
+++ b/pkg/darwin_amd64/go/constant.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/doc.a b/pkg/darwin_amd64/go/doc.a
index 0ba4cec..eab3f01 100644
--- a/pkg/darwin_amd64/go/doc.a
+++ b/pkg/darwin_amd64/go/doc.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/format.a b/pkg/darwin_amd64/go/format.a
index 1a15cac..266835c 100644
--- a/pkg/darwin_amd64/go/format.a
+++ b/pkg/darwin_amd64/go/format.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/importer.a b/pkg/darwin_amd64/go/importer.a
index faca9e5..7ae1feb 100644
--- a/pkg/darwin_amd64/go/importer.a
+++ b/pkg/darwin_amd64/go/importer.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/internal/gccgoimporter.a b/pkg/darwin_amd64/go/internal/gccgoimporter.a
index 4d59749..da36057 100644
--- a/pkg/darwin_amd64/go/internal/gccgoimporter.a
+++ b/pkg/darwin_amd64/go/internal/gccgoimporter.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/internal/gcimporter.a b/pkg/darwin_amd64/go/internal/gcimporter.a
index 257e44d..b829977 100644
--- a/pkg/darwin_amd64/go/internal/gcimporter.a
+++ b/pkg/darwin_amd64/go/internal/gcimporter.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/parser.a b/pkg/darwin_amd64/go/parser.a
index c1abe9b..cfb3afe 100644
--- a/pkg/darwin_amd64/go/parser.a
+++ b/pkg/darwin_amd64/go/parser.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/printer.a b/pkg/darwin_amd64/go/printer.a
index 45ae77e..5240751 100644
--- a/pkg/darwin_amd64/go/printer.a
+++ b/pkg/darwin_amd64/go/printer.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/scanner.a b/pkg/darwin_amd64/go/scanner.a
index 9d2b936..4b90fc1 100644
--- a/pkg/darwin_amd64/go/scanner.a
+++ b/pkg/darwin_amd64/go/scanner.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/token.a b/pkg/darwin_amd64/go/token.a
index 165abac..5df1dae 100644
--- a/pkg/darwin_amd64/go/token.a
+++ b/pkg/darwin_amd64/go/token.a
Binary files differ
diff --git a/pkg/darwin_amd64/go/types.a b/pkg/darwin_amd64/go/types.a
index a62b6d7..e50f0cc 100644
--- a/pkg/darwin_amd64/go/types.a
+++ b/pkg/darwin_amd64/go/types.a
Binary files differ
diff --git a/pkg/darwin_amd64/hash.a b/pkg/darwin_amd64/hash.a
index a7b45c7..6746112 100644
--- a/pkg/darwin_amd64/hash.a
+++ b/pkg/darwin_amd64/hash.a
Binary files differ
diff --git a/pkg/darwin_amd64/hash/adler32.a b/pkg/darwin_amd64/hash/adler32.a
index ba520c0..6ce5489 100644
--- a/pkg/darwin_amd64/hash/adler32.a
+++ b/pkg/darwin_amd64/hash/adler32.a
Binary files differ
diff --git a/pkg/darwin_amd64/hash/crc32.a b/pkg/darwin_amd64/hash/crc32.a
index a93d771..a4bf5ab 100644
--- a/pkg/darwin_amd64/hash/crc32.a
+++ b/pkg/darwin_amd64/hash/crc32.a
Binary files differ
diff --git a/pkg/darwin_amd64/hash/crc64.a b/pkg/darwin_amd64/hash/crc64.a
index e9bf11b..f19daea 100644
--- a/pkg/darwin_amd64/hash/crc64.a
+++ b/pkg/darwin_amd64/hash/crc64.a
Binary files differ
diff --git a/pkg/darwin_amd64/hash/fnv.a b/pkg/darwin_amd64/hash/fnv.a
index d598c8f..5ed58ee 100644
--- a/pkg/darwin_amd64/hash/fnv.a
+++ b/pkg/darwin_amd64/hash/fnv.a
Binary files differ
diff --git a/pkg/darwin_amd64/html.a b/pkg/darwin_amd64/html.a
index 8d338c4..ff83e5b 100644
--- a/pkg/darwin_amd64/html.a
+++ b/pkg/darwin_amd64/html.a
Binary files differ
diff --git a/pkg/darwin_amd64/html/template.a b/pkg/darwin_amd64/html/template.a
index 09d6ed8..123acfb 100644
--- a/pkg/darwin_amd64/html/template.a
+++ b/pkg/darwin_amd64/html/template.a
Binary files differ
diff --git a/pkg/darwin_amd64/image.a b/pkg/darwin_amd64/image.a
index c6a7fca..09f74c9 100644
--- a/pkg/darwin_amd64/image.a
+++ b/pkg/darwin_amd64/image.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/color.a b/pkg/darwin_amd64/image/color.a
index ee5f40d..66fac95 100644
--- a/pkg/darwin_amd64/image/color.a
+++ b/pkg/darwin_amd64/image/color.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/color/palette.a b/pkg/darwin_amd64/image/color/palette.a
index 79c43c3..c5d7fb7 100644
--- a/pkg/darwin_amd64/image/color/palette.a
+++ b/pkg/darwin_amd64/image/color/palette.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/draw.a b/pkg/darwin_amd64/image/draw.a
index ab5872a..98efd94 100644
--- a/pkg/darwin_amd64/image/draw.a
+++ b/pkg/darwin_amd64/image/draw.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/gif.a b/pkg/darwin_amd64/image/gif.a
index 8440dc7..514d9aa 100644
--- a/pkg/darwin_amd64/image/gif.a
+++ b/pkg/darwin_amd64/image/gif.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/internal/imageutil.a b/pkg/darwin_amd64/image/internal/imageutil.a
index 8373f4a..9e0ca74 100644
--- a/pkg/darwin_amd64/image/internal/imageutil.a
+++ b/pkg/darwin_amd64/image/internal/imageutil.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/jpeg.a b/pkg/darwin_amd64/image/jpeg.a
index fa68cb5..8976c5c 100644
--- a/pkg/darwin_amd64/image/jpeg.a
+++ b/pkg/darwin_amd64/image/jpeg.a
Binary files differ
diff --git a/pkg/darwin_amd64/image/png.a b/pkg/darwin_amd64/image/png.a
index 3da51cc..3846754 100644
--- a/pkg/darwin_amd64/image/png.a
+++ b/pkg/darwin_amd64/image/png.a
Binary files differ
diff --git a/pkg/darwin_amd64/index/suffixarray.a b/pkg/darwin_amd64/index/suffixarray.a
index 22577cb..b3f080e 100644
--- a/pkg/darwin_amd64/index/suffixarray.a
+++ b/pkg/darwin_amd64/index/suffixarray.a
Binary files differ
diff --git a/pkg/darwin_amd64/internal/format.a b/pkg/darwin_amd64/internal/format.a
index f96faf0..20994a0 100644
--- a/pkg/darwin_amd64/internal/format.a
+++ b/pkg/darwin_amd64/internal/format.a
Binary files differ
diff --git a/pkg/darwin_amd64/internal/singleflight.a b/pkg/darwin_amd64/internal/singleflight.a
index b488701..fc2da2d 100644
--- a/pkg/darwin_amd64/internal/singleflight.a
+++ b/pkg/darwin_amd64/internal/singleflight.a
Binary files differ
diff --git a/pkg/darwin_amd64/internal/testenv.a b/pkg/darwin_amd64/internal/testenv.a
index 94d4037..2047685 100644
--- a/pkg/darwin_amd64/internal/testenv.a
+++ b/pkg/darwin_amd64/internal/testenv.a
Binary files differ
diff --git a/pkg/darwin_amd64/internal/trace.a b/pkg/darwin_amd64/internal/trace.a
index 8aa9fa8..7958d14 100644
--- a/pkg/darwin_amd64/internal/trace.a
+++ b/pkg/darwin_amd64/internal/trace.a
Binary files differ
diff --git a/pkg/darwin_amd64/io.a b/pkg/darwin_amd64/io.a
index 8866cc0..e0392e7 100644
--- a/pkg/darwin_amd64/io.a
+++ b/pkg/darwin_amd64/io.a
Binary files differ
diff --git a/pkg/darwin_amd64/io/ioutil.a b/pkg/darwin_amd64/io/ioutil.a
index aeb8ecd..aabb25c 100644
--- a/pkg/darwin_amd64/io/ioutil.a
+++ b/pkg/darwin_amd64/io/ioutil.a
Binary files differ
diff --git a/pkg/darwin_amd64/log.a b/pkg/darwin_amd64/log.a
index ce55cd3..dc2770f 100644
--- a/pkg/darwin_amd64/log.a
+++ b/pkg/darwin_amd64/log.a
Binary files differ
diff --git a/pkg/darwin_amd64/log/syslog.a b/pkg/darwin_amd64/log/syslog.a
index c0abcc2..1b82565 100644
--- a/pkg/darwin_amd64/log/syslog.a
+++ b/pkg/darwin_amd64/log/syslog.a
Binary files differ
diff --git a/pkg/darwin_amd64/math.a b/pkg/darwin_amd64/math.a
index 23d9a23..bb7a38f 100644
--- a/pkg/darwin_amd64/math.a
+++ b/pkg/darwin_amd64/math.a
Binary files differ
diff --git a/pkg/darwin_amd64/math/big.a b/pkg/darwin_amd64/math/big.a
index d0f9165..15c10ea 100644
--- a/pkg/darwin_amd64/math/big.a
+++ b/pkg/darwin_amd64/math/big.a
Binary files differ
diff --git a/pkg/darwin_amd64/math/cmplx.a b/pkg/darwin_amd64/math/cmplx.a
index 35703df..a07ad02 100644
--- a/pkg/darwin_amd64/math/cmplx.a
+++ b/pkg/darwin_amd64/math/cmplx.a
Binary files differ
diff --git a/pkg/darwin_amd64/math/rand.a b/pkg/darwin_amd64/math/rand.a
index 8b8fe9d..1fedcae 100644
--- a/pkg/darwin_amd64/math/rand.a
+++ b/pkg/darwin_amd64/math/rand.a
Binary files differ
diff --git a/pkg/darwin_amd64/mime.a b/pkg/darwin_amd64/mime.a
index e873dc3..4e747af 100644
--- a/pkg/darwin_amd64/mime.a
+++ b/pkg/darwin_amd64/mime.a
Binary files differ
diff --git a/pkg/darwin_amd64/mime/multipart.a b/pkg/darwin_amd64/mime/multipart.a
index 0dfc759..dc0038a 100644
--- a/pkg/darwin_amd64/mime/multipart.a
+++ b/pkg/darwin_amd64/mime/multipart.a
Binary files differ
diff --git a/pkg/darwin_amd64/mime/quotedprintable.a b/pkg/darwin_amd64/mime/quotedprintable.a
index e3157b8..dbac3f7 100644
--- a/pkg/darwin_amd64/mime/quotedprintable.a
+++ b/pkg/darwin_amd64/mime/quotedprintable.a
Binary files differ
diff --git a/pkg/darwin_amd64/net.a b/pkg/darwin_amd64/net.a
index e97dfe0..a585a96 100644
--- a/pkg/darwin_amd64/net.a
+++ b/pkg/darwin_amd64/net.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http.a b/pkg/darwin_amd64/net/http.a
index 3d2d832..854fc51 100644
--- a/pkg/darwin_amd64/net/http.a
+++ b/pkg/darwin_amd64/net/http.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/cgi.a b/pkg/darwin_amd64/net/http/cgi.a
index 289ed76..6ccde80 100644
--- a/pkg/darwin_amd64/net/http/cgi.a
+++ b/pkg/darwin_amd64/net/http/cgi.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/cookiejar.a b/pkg/darwin_amd64/net/http/cookiejar.a
index 71f4918..501b731 100644
--- a/pkg/darwin_amd64/net/http/cookiejar.a
+++ b/pkg/darwin_amd64/net/http/cookiejar.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/fcgi.a b/pkg/darwin_amd64/net/http/fcgi.a
index cbd8349..ce82855 100644
--- a/pkg/darwin_amd64/net/http/fcgi.a
+++ b/pkg/darwin_amd64/net/http/fcgi.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/httptest.a b/pkg/darwin_amd64/net/http/httptest.a
index fb58e06..66bd642 100644
--- a/pkg/darwin_amd64/net/http/httptest.a
+++ b/pkg/darwin_amd64/net/http/httptest.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/httputil.a b/pkg/darwin_amd64/net/http/httputil.a
index e368cc3..874fd6c 100644
--- a/pkg/darwin_amd64/net/http/httputil.a
+++ b/pkg/darwin_amd64/net/http/httputil.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/internal.a b/pkg/darwin_amd64/net/http/internal.a
index 9b1771d..3184b8c 100644
--- a/pkg/darwin_amd64/net/http/internal.a
+++ b/pkg/darwin_amd64/net/http/internal.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/http/pprof.a b/pkg/darwin_amd64/net/http/pprof.a
index a333e01..e116551 100644
--- a/pkg/darwin_amd64/net/http/pprof.a
+++ b/pkg/darwin_amd64/net/http/pprof.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/internal/socktest.a b/pkg/darwin_amd64/net/internal/socktest.a
index 96f0711..fa3c3ff 100644
--- a/pkg/darwin_amd64/net/internal/socktest.a
+++ b/pkg/darwin_amd64/net/internal/socktest.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/mail.a b/pkg/darwin_amd64/net/mail.a
index 27527d1..87e4786 100644
--- a/pkg/darwin_amd64/net/mail.a
+++ b/pkg/darwin_amd64/net/mail.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/rpc.a b/pkg/darwin_amd64/net/rpc.a
index d35917e..e5ba6fd 100644
--- a/pkg/darwin_amd64/net/rpc.a
+++ b/pkg/darwin_amd64/net/rpc.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/rpc/jsonrpc.a b/pkg/darwin_amd64/net/rpc/jsonrpc.a
index 82aac04..3aa13a5 100644
--- a/pkg/darwin_amd64/net/rpc/jsonrpc.a
+++ b/pkg/darwin_amd64/net/rpc/jsonrpc.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/smtp.a b/pkg/darwin_amd64/net/smtp.a
index 533678c..1a83579 100644
--- a/pkg/darwin_amd64/net/smtp.a
+++ b/pkg/darwin_amd64/net/smtp.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/textproto.a b/pkg/darwin_amd64/net/textproto.a
index c040d59..f59d3db 100644
--- a/pkg/darwin_amd64/net/textproto.a
+++ b/pkg/darwin_amd64/net/textproto.a
Binary files differ
diff --git a/pkg/darwin_amd64/net/url.a b/pkg/darwin_amd64/net/url.a
index b71d940..68e2f5e 100644
--- a/pkg/darwin_amd64/net/url.a
+++ b/pkg/darwin_amd64/net/url.a
Binary files differ
diff --git a/pkg/darwin_amd64/os.a b/pkg/darwin_amd64/os.a
index 15124cd..603ab56 100644
--- a/pkg/darwin_amd64/os.a
+++ b/pkg/darwin_amd64/os.a
Binary files differ
diff --git a/pkg/darwin_amd64/os/exec.a b/pkg/darwin_amd64/os/exec.a
index 3bf558a..f27dc4f 100644
--- a/pkg/darwin_amd64/os/exec.a
+++ b/pkg/darwin_amd64/os/exec.a
Binary files differ
diff --git a/pkg/darwin_amd64/os/signal.a b/pkg/darwin_amd64/os/signal.a
index 0724210..13ad7cb 100644
--- a/pkg/darwin_amd64/os/signal.a
+++ b/pkg/darwin_amd64/os/signal.a
Binary files differ
diff --git a/pkg/darwin_amd64/os/user.a b/pkg/darwin_amd64/os/user.a
index 304ec88..2d64d29 100644
--- a/pkg/darwin_amd64/os/user.a
+++ b/pkg/darwin_amd64/os/user.a
Binary files differ
diff --git a/pkg/darwin_amd64/path.a b/pkg/darwin_amd64/path.a
index f274456..a510248 100644
--- a/pkg/darwin_amd64/path.a
+++ b/pkg/darwin_amd64/path.a
Binary files differ
diff --git a/pkg/darwin_amd64/path/filepath.a b/pkg/darwin_amd64/path/filepath.a
index 43002b4..e5e03da 100644
--- a/pkg/darwin_amd64/path/filepath.a
+++ b/pkg/darwin_amd64/path/filepath.a
Binary files differ
diff --git a/pkg/darwin_amd64/reflect.a b/pkg/darwin_amd64/reflect.a
index 87a41db..bea3dab 100644
--- a/pkg/darwin_amd64/reflect.a
+++ b/pkg/darwin_amd64/reflect.a
Binary files differ
diff --git a/pkg/darwin_amd64/regexp.a b/pkg/darwin_amd64/regexp.a
index 2c1e5ce..d36d783 100644
--- a/pkg/darwin_amd64/regexp.a
+++ b/pkg/darwin_amd64/regexp.a
Binary files differ
diff --git a/pkg/darwin_amd64/regexp/syntax.a b/pkg/darwin_amd64/regexp/syntax.a
index cba015a..ea0fc8b 100644
--- a/pkg/darwin_amd64/regexp/syntax.a
+++ b/pkg/darwin_amd64/regexp/syntax.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime.a b/pkg/darwin_amd64/runtime.a
index c5c01ab..6ca0338 100644
--- a/pkg/darwin_amd64/runtime.a
+++ b/pkg/darwin_amd64/runtime.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime/cgo.a b/pkg/darwin_amd64/runtime/cgo.a
index 3475837..37934e1 100644
--- a/pkg/darwin_amd64/runtime/cgo.a
+++ b/pkg/darwin_amd64/runtime/cgo.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime/debug.a b/pkg/darwin_amd64/runtime/debug.a
index 828567e..5739dc9 100644
--- a/pkg/darwin_amd64/runtime/debug.a
+++ b/pkg/darwin_amd64/runtime/debug.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime/pprof.a b/pkg/darwin_amd64/runtime/pprof.a
index bd7d075..c88ce2b 100644
--- a/pkg/darwin_amd64/runtime/pprof.a
+++ b/pkg/darwin_amd64/runtime/pprof.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime/race.a b/pkg/darwin_amd64/runtime/race.a
index 7e36543..871abc0 100644
--- a/pkg/darwin_amd64/runtime/race.a
+++ b/pkg/darwin_amd64/runtime/race.a
Binary files differ
diff --git a/pkg/darwin_amd64/runtime/trace.a b/pkg/darwin_amd64/runtime/trace.a
index 31cc851..d085456 100644
--- a/pkg/darwin_amd64/runtime/trace.a
+++ b/pkg/darwin_amd64/runtime/trace.a
Binary files differ
diff --git a/pkg/darwin_amd64/sort.a b/pkg/darwin_amd64/sort.a
index 29f39ef..8752528 100644
--- a/pkg/darwin_amd64/sort.a
+++ b/pkg/darwin_amd64/sort.a
Binary files differ
diff --git a/pkg/darwin_amd64/strconv.a b/pkg/darwin_amd64/strconv.a
index 0febfe5..bceb9c6 100644
--- a/pkg/darwin_amd64/strconv.a
+++ b/pkg/darwin_amd64/strconv.a
Binary files differ
diff --git a/pkg/darwin_amd64/strings.a b/pkg/darwin_amd64/strings.a
index be17554..8867807 100644
--- a/pkg/darwin_amd64/strings.a
+++ b/pkg/darwin_amd64/strings.a
Binary files differ
diff --git a/pkg/darwin_amd64/sync.a b/pkg/darwin_amd64/sync.a
index aee9a60..cc0efc8 100644
--- a/pkg/darwin_amd64/sync.a
+++ b/pkg/darwin_amd64/sync.a
Binary files differ
diff --git a/pkg/darwin_amd64/sync/atomic.a b/pkg/darwin_amd64/sync/atomic.a
index c80f85f..f5680c8 100644
--- a/pkg/darwin_amd64/sync/atomic.a
+++ b/pkg/darwin_amd64/sync/atomic.a
Binary files differ
diff --git a/pkg/darwin_amd64/syscall.a b/pkg/darwin_amd64/syscall.a
index 7fa30c9..d2a23d0 100644
--- a/pkg/darwin_amd64/syscall.a
+++ b/pkg/darwin_amd64/syscall.a
Binary files differ
diff --git a/pkg/darwin_amd64/testing.a b/pkg/darwin_amd64/testing.a
index 1ad9228..dab8fb8 100644
--- a/pkg/darwin_amd64/testing.a
+++ b/pkg/darwin_amd64/testing.a
Binary files differ
diff --git a/pkg/darwin_amd64/testing/iotest.a b/pkg/darwin_amd64/testing/iotest.a
index daaa492..ecf828f 100644
--- a/pkg/darwin_amd64/testing/iotest.a
+++ b/pkg/darwin_amd64/testing/iotest.a
Binary files differ
diff --git a/pkg/darwin_amd64/testing/quick.a b/pkg/darwin_amd64/testing/quick.a
index 36b03f0..b6786c9 100644
--- a/pkg/darwin_amd64/testing/quick.a
+++ b/pkg/darwin_amd64/testing/quick.a
Binary files differ
diff --git a/pkg/darwin_amd64/text/scanner.a b/pkg/darwin_amd64/text/scanner.a
index d62a78f..c51d5a0 100644
--- a/pkg/darwin_amd64/text/scanner.a
+++ b/pkg/darwin_amd64/text/scanner.a
Binary files differ
diff --git a/pkg/darwin_amd64/text/tabwriter.a b/pkg/darwin_amd64/text/tabwriter.a
index c897c37..7903cce 100644
--- a/pkg/darwin_amd64/text/tabwriter.a
+++ b/pkg/darwin_amd64/text/tabwriter.a
Binary files differ
diff --git a/pkg/darwin_amd64/text/template.a b/pkg/darwin_amd64/text/template.a
index 997b2cc..c614660 100644
--- a/pkg/darwin_amd64/text/template.a
+++ b/pkg/darwin_amd64/text/template.a
Binary files differ
diff --git a/pkg/darwin_amd64/text/template/parse.a b/pkg/darwin_amd64/text/template/parse.a
index 1e115df..bed7de9 100644
--- a/pkg/darwin_amd64/text/template/parse.a
+++ b/pkg/darwin_amd64/text/template/parse.a
Binary files differ
diff --git a/pkg/darwin_amd64/time.a b/pkg/darwin_amd64/time.a
index f7c5e35..702d419 100644
--- a/pkg/darwin_amd64/time.a
+++ b/pkg/darwin_amd64/time.a
Binary files differ
diff --git a/pkg/darwin_amd64/unicode.a b/pkg/darwin_amd64/unicode.a
index 2f557a2..6c8724b 100644
--- a/pkg/darwin_amd64/unicode.a
+++ b/pkg/darwin_amd64/unicode.a
Binary files differ
diff --git a/pkg/darwin_amd64/unicode/utf16.a b/pkg/darwin_amd64/unicode/utf16.a
index e50e067..fcc17b6 100644
--- a/pkg/darwin_amd64/unicode/utf16.a
+++ b/pkg/darwin_amd64/unicode/utf16.a
Binary files differ
diff --git a/pkg/darwin_amd64/unicode/utf8.a b/pkg/darwin_amd64/unicode/utf8.a
index 1d54513..2aa083d 100644
--- a/pkg/darwin_amd64/unicode/utf8.a
+++ b/pkg/darwin_amd64/unicode/utf8.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/archive/tar.a b/pkg/darwin_amd64_race/archive/tar.a
index 69396f4..c40a0b9 100644
--- a/pkg/darwin_amd64_race/archive/tar.a
+++ b/pkg/darwin_amd64_race/archive/tar.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/archive/zip.a b/pkg/darwin_amd64_race/archive/zip.a
index 185dae9..f2065bc 100644
--- a/pkg/darwin_amd64_race/archive/zip.a
+++ b/pkg/darwin_amd64_race/archive/zip.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/bufio.a b/pkg/darwin_amd64_race/bufio.a
index de92b98..cef85aa 100644
--- a/pkg/darwin_amd64_race/bufio.a
+++ b/pkg/darwin_amd64_race/bufio.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/bytes.a b/pkg/darwin_amd64_race/bytes.a
index 46f827b..fbbda32 100644
--- a/pkg/darwin_amd64_race/bytes.a
+++ b/pkg/darwin_amd64_race/bytes.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/compress/bzip2.a b/pkg/darwin_amd64_race/compress/bzip2.a
index b921046..bf9eda0 100644
--- a/pkg/darwin_amd64_race/compress/bzip2.a
+++ b/pkg/darwin_amd64_race/compress/bzip2.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/compress/flate.a b/pkg/darwin_amd64_race/compress/flate.a
index ace1098..d212249 100644
--- a/pkg/darwin_amd64_race/compress/flate.a
+++ b/pkg/darwin_amd64_race/compress/flate.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/compress/gzip.a b/pkg/darwin_amd64_race/compress/gzip.a
index 813dda6..c8d5e52 100644
--- a/pkg/darwin_amd64_race/compress/gzip.a
+++ b/pkg/darwin_amd64_race/compress/gzip.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/compress/lzw.a b/pkg/darwin_amd64_race/compress/lzw.a
index 5d7b0b4..4ec02bf 100644
--- a/pkg/darwin_amd64_race/compress/lzw.a
+++ b/pkg/darwin_amd64_race/compress/lzw.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/compress/zlib.a b/pkg/darwin_amd64_race/compress/zlib.a
index 3fb5514..9d42a03 100644
--- a/pkg/darwin_amd64_race/compress/zlib.a
+++ b/pkg/darwin_amd64_race/compress/zlib.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/container/heap.a b/pkg/darwin_amd64_race/container/heap.a
index 65067c1..f54f4ac 100644
--- a/pkg/darwin_amd64_race/container/heap.a
+++ b/pkg/darwin_amd64_race/container/heap.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/container/list.a b/pkg/darwin_amd64_race/container/list.a
index b93a819..507a5e1 100644
--- a/pkg/darwin_amd64_race/container/list.a
+++ b/pkg/darwin_amd64_race/container/list.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/container/ring.a b/pkg/darwin_amd64_race/container/ring.a
index c4c7969..c4900e5 100644
--- a/pkg/darwin_amd64_race/container/ring.a
+++ b/pkg/darwin_amd64_race/container/ring.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto.a b/pkg/darwin_amd64_race/crypto.a
index 1cd9ce6..54555a1 100644
--- a/pkg/darwin_amd64_race/crypto.a
+++ b/pkg/darwin_amd64_race/crypto.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/aes.a b/pkg/darwin_amd64_race/crypto/aes.a
index b5d3015..d9e50d2 100644
--- a/pkg/darwin_amd64_race/crypto/aes.a
+++ b/pkg/darwin_amd64_race/crypto/aes.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/cipher.a b/pkg/darwin_amd64_race/crypto/cipher.a
index 23b9e48..520a8dd 100644
--- a/pkg/darwin_amd64_race/crypto/cipher.a
+++ b/pkg/darwin_amd64_race/crypto/cipher.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/des.a b/pkg/darwin_amd64_race/crypto/des.a
index 78148ec..0ec6755 100644
--- a/pkg/darwin_amd64_race/crypto/des.a
+++ b/pkg/darwin_amd64_race/crypto/des.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/dsa.a b/pkg/darwin_amd64_race/crypto/dsa.a
index 6d74647..e5458cb 100644
--- a/pkg/darwin_amd64_race/crypto/dsa.a
+++ b/pkg/darwin_amd64_race/crypto/dsa.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/ecdsa.a b/pkg/darwin_amd64_race/crypto/ecdsa.a
index 43f3d7c..504a396 100644
--- a/pkg/darwin_amd64_race/crypto/ecdsa.a
+++ b/pkg/darwin_amd64_race/crypto/ecdsa.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/elliptic.a b/pkg/darwin_amd64_race/crypto/elliptic.a
index bdfa9c8..a467811 100644
--- a/pkg/darwin_amd64_race/crypto/elliptic.a
+++ b/pkg/darwin_amd64_race/crypto/elliptic.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/hmac.a b/pkg/darwin_amd64_race/crypto/hmac.a
index 7f2e876..5e12f20 100644
--- a/pkg/darwin_amd64_race/crypto/hmac.a
+++ b/pkg/darwin_amd64_race/crypto/hmac.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/md5.a b/pkg/darwin_amd64_race/crypto/md5.a
index 22aa587..a7d0f1d 100644
--- a/pkg/darwin_amd64_race/crypto/md5.a
+++ b/pkg/darwin_amd64_race/crypto/md5.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/rand.a b/pkg/darwin_amd64_race/crypto/rand.a
index 648b84d..dcba2bd 100644
--- a/pkg/darwin_amd64_race/crypto/rand.a
+++ b/pkg/darwin_amd64_race/crypto/rand.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/rc4.a b/pkg/darwin_amd64_race/crypto/rc4.a
index fe87963..916bc8e 100644
--- a/pkg/darwin_amd64_race/crypto/rc4.a
+++ b/pkg/darwin_amd64_race/crypto/rc4.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/rsa.a b/pkg/darwin_amd64_race/crypto/rsa.a
index e541480..cae4bac 100644
--- a/pkg/darwin_amd64_race/crypto/rsa.a
+++ b/pkg/darwin_amd64_race/crypto/rsa.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/sha1.a b/pkg/darwin_amd64_race/crypto/sha1.a
index ad2a190..f52ef00 100644
--- a/pkg/darwin_amd64_race/crypto/sha1.a
+++ b/pkg/darwin_amd64_race/crypto/sha1.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/sha256.a b/pkg/darwin_amd64_race/crypto/sha256.a
index c1872d5..e107b7f 100644
--- a/pkg/darwin_amd64_race/crypto/sha256.a
+++ b/pkg/darwin_amd64_race/crypto/sha256.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/sha512.a b/pkg/darwin_amd64_race/crypto/sha512.a
index ef967d5..93609c8 100644
--- a/pkg/darwin_amd64_race/crypto/sha512.a
+++ b/pkg/darwin_amd64_race/crypto/sha512.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/subtle.a b/pkg/darwin_amd64_race/crypto/subtle.a
index b3f4950..07be76e 100644
--- a/pkg/darwin_amd64_race/crypto/subtle.a
+++ b/pkg/darwin_amd64_race/crypto/subtle.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/tls.a b/pkg/darwin_amd64_race/crypto/tls.a
index bd103aa..128f7b6 100644
--- a/pkg/darwin_amd64_race/crypto/tls.a
+++ b/pkg/darwin_amd64_race/crypto/tls.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/x509.a b/pkg/darwin_amd64_race/crypto/x509.a
index 8029f2a..ba84e1b 100644
--- a/pkg/darwin_amd64_race/crypto/x509.a
+++ b/pkg/darwin_amd64_race/crypto/x509.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/crypto/x509/pkix.a b/pkg/darwin_amd64_race/crypto/x509/pkix.a
index 5ad0e39..cac34fd 100644
--- a/pkg/darwin_amd64_race/crypto/x509/pkix.a
+++ b/pkg/darwin_amd64_race/crypto/x509/pkix.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/database/sql.a b/pkg/darwin_amd64_race/database/sql.a
index 9221c90..bd29149 100644
--- a/pkg/darwin_amd64_race/database/sql.a
+++ b/pkg/darwin_amd64_race/database/sql.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/database/sql/driver.a b/pkg/darwin_amd64_race/database/sql/driver.a
index 91c5e9e..b2e951a 100644
--- a/pkg/darwin_amd64_race/database/sql/driver.a
+++ b/pkg/darwin_amd64_race/database/sql/driver.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/dwarf.a b/pkg/darwin_amd64_race/debug/dwarf.a
index ed3e5aa..166fb18 100644
--- a/pkg/darwin_amd64_race/debug/dwarf.a
+++ b/pkg/darwin_amd64_race/debug/dwarf.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/elf.a b/pkg/darwin_amd64_race/debug/elf.a
index 9219dea..c07412f 100644
--- a/pkg/darwin_amd64_race/debug/elf.a
+++ b/pkg/darwin_amd64_race/debug/elf.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/gosym.a b/pkg/darwin_amd64_race/debug/gosym.a
index 95803cc..ca3e012 100644
--- a/pkg/darwin_amd64_race/debug/gosym.a
+++ b/pkg/darwin_amd64_race/debug/gosym.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/macho.a b/pkg/darwin_amd64_race/debug/macho.a
index 2bdc8a7..1c3c23e 100644
--- a/pkg/darwin_amd64_race/debug/macho.a
+++ b/pkg/darwin_amd64_race/debug/macho.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/pe.a b/pkg/darwin_amd64_race/debug/pe.a
index 0abd8fa..54491a3 100644
--- a/pkg/darwin_amd64_race/debug/pe.a
+++ b/pkg/darwin_amd64_race/debug/pe.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/debug/plan9obj.a b/pkg/darwin_amd64_race/debug/plan9obj.a
index 6e1013c..6340eeb 100644
--- a/pkg/darwin_amd64_race/debug/plan9obj.a
+++ b/pkg/darwin_amd64_race/debug/plan9obj.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding.a b/pkg/darwin_amd64_race/encoding.a
index 496b5f7..9d29cda 100644
--- a/pkg/darwin_amd64_race/encoding.a
+++ b/pkg/darwin_amd64_race/encoding.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/ascii85.a b/pkg/darwin_amd64_race/encoding/ascii85.a
index cd2c324..9fcd655 100644
--- a/pkg/darwin_amd64_race/encoding/ascii85.a
+++ b/pkg/darwin_amd64_race/encoding/ascii85.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/asn1.a b/pkg/darwin_amd64_race/encoding/asn1.a
index 0ff66e9..68a29df 100644
--- a/pkg/darwin_amd64_race/encoding/asn1.a
+++ b/pkg/darwin_amd64_race/encoding/asn1.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/base32.a b/pkg/darwin_amd64_race/encoding/base32.a
index c6b2960..8e56192 100644
--- a/pkg/darwin_amd64_race/encoding/base32.a
+++ b/pkg/darwin_amd64_race/encoding/base32.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/base64.a b/pkg/darwin_amd64_race/encoding/base64.a
index b4c9431..f92ead2 100644
--- a/pkg/darwin_amd64_race/encoding/base64.a
+++ b/pkg/darwin_amd64_race/encoding/base64.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/binary.a b/pkg/darwin_amd64_race/encoding/binary.a
index cefd1a5..211c038 100644
--- a/pkg/darwin_amd64_race/encoding/binary.a
+++ b/pkg/darwin_amd64_race/encoding/binary.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/csv.a b/pkg/darwin_amd64_race/encoding/csv.a
index f9d10b2..741cc05 100644
--- a/pkg/darwin_amd64_race/encoding/csv.a
+++ b/pkg/darwin_amd64_race/encoding/csv.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/gob.a b/pkg/darwin_amd64_race/encoding/gob.a
index 8bff2b7..e543f76 100644
--- a/pkg/darwin_amd64_race/encoding/gob.a
+++ b/pkg/darwin_amd64_race/encoding/gob.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/hex.a b/pkg/darwin_amd64_race/encoding/hex.a
index 44a5506..89b47b3 100644
--- a/pkg/darwin_amd64_race/encoding/hex.a
+++ b/pkg/darwin_amd64_race/encoding/hex.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/json.a b/pkg/darwin_amd64_race/encoding/json.a
index 95d31e4..26273a1 100644
--- a/pkg/darwin_amd64_race/encoding/json.a
+++ b/pkg/darwin_amd64_race/encoding/json.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/pem.a b/pkg/darwin_amd64_race/encoding/pem.a
index 6236314..4c004c7 100644
--- a/pkg/darwin_amd64_race/encoding/pem.a
+++ b/pkg/darwin_amd64_race/encoding/pem.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/encoding/xml.a b/pkg/darwin_amd64_race/encoding/xml.a
index 002b08e..7acb427 100644
--- a/pkg/darwin_amd64_race/encoding/xml.a
+++ b/pkg/darwin_amd64_race/encoding/xml.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/errors.a b/pkg/darwin_amd64_race/errors.a
index 6903745..430e4ee 100644
--- a/pkg/darwin_amd64_race/errors.a
+++ b/pkg/darwin_amd64_race/errors.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/expvar.a b/pkg/darwin_amd64_race/expvar.a
index 7da6b15..5100401 100644
--- a/pkg/darwin_amd64_race/expvar.a
+++ b/pkg/darwin_amd64_race/expvar.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/flag.a b/pkg/darwin_amd64_race/flag.a
index ac76789..3e4d2d9 100644
--- a/pkg/darwin_amd64_race/flag.a
+++ b/pkg/darwin_amd64_race/flag.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/fmt.a b/pkg/darwin_amd64_race/fmt.a
index 9d5707b..99887ca 100644
--- a/pkg/darwin_amd64_race/fmt.a
+++ b/pkg/darwin_amd64_race/fmt.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/ast.a b/pkg/darwin_amd64_race/go/ast.a
index 40d583b..bfb9cec 100644
--- a/pkg/darwin_amd64_race/go/ast.a
+++ b/pkg/darwin_amd64_race/go/ast.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/build.a b/pkg/darwin_amd64_race/go/build.a
index fc05989..6eaef10 100644
--- a/pkg/darwin_amd64_race/go/build.a
+++ b/pkg/darwin_amd64_race/go/build.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/constant.a b/pkg/darwin_amd64_race/go/constant.a
index 5c12598..385bc5d 100644
--- a/pkg/darwin_amd64_race/go/constant.a
+++ b/pkg/darwin_amd64_race/go/constant.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/doc.a b/pkg/darwin_amd64_race/go/doc.a
index 15cbf35..e00d5b3 100644
--- a/pkg/darwin_amd64_race/go/doc.a
+++ b/pkg/darwin_amd64_race/go/doc.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/format.a b/pkg/darwin_amd64_race/go/format.a
index 20653d9..8a9e1a7 100644
--- a/pkg/darwin_amd64_race/go/format.a
+++ b/pkg/darwin_amd64_race/go/format.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/importer.a b/pkg/darwin_amd64_race/go/importer.a
index a246cb5..6e16cf6 100644
--- a/pkg/darwin_amd64_race/go/importer.a
+++ b/pkg/darwin_amd64_race/go/importer.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/internal/gccgoimporter.a b/pkg/darwin_amd64_race/go/internal/gccgoimporter.a
index d9950b9..b49e056 100644
--- a/pkg/darwin_amd64_race/go/internal/gccgoimporter.a
+++ b/pkg/darwin_amd64_race/go/internal/gccgoimporter.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/internal/gcimporter.a b/pkg/darwin_amd64_race/go/internal/gcimporter.a
index 634a63d..21b1efa 100644
--- a/pkg/darwin_amd64_race/go/internal/gcimporter.a
+++ b/pkg/darwin_amd64_race/go/internal/gcimporter.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/parser.a b/pkg/darwin_amd64_race/go/parser.a
index f919883..d9f8a7f 100644
--- a/pkg/darwin_amd64_race/go/parser.a
+++ b/pkg/darwin_amd64_race/go/parser.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/printer.a b/pkg/darwin_amd64_race/go/printer.a
index 5e4e10c..db9bb83 100644
--- a/pkg/darwin_amd64_race/go/printer.a
+++ b/pkg/darwin_amd64_race/go/printer.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/scanner.a b/pkg/darwin_amd64_race/go/scanner.a
index 01686a0..12ca576 100644
--- a/pkg/darwin_amd64_race/go/scanner.a
+++ b/pkg/darwin_amd64_race/go/scanner.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/token.a b/pkg/darwin_amd64_race/go/token.a
index 4d4ff0f..ab40854 100644
--- a/pkg/darwin_amd64_race/go/token.a
+++ b/pkg/darwin_amd64_race/go/token.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/go/types.a b/pkg/darwin_amd64_race/go/types.a
index d3e3d42..e43d784 100644
--- a/pkg/darwin_amd64_race/go/types.a
+++ b/pkg/darwin_amd64_race/go/types.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/hash.a b/pkg/darwin_amd64_race/hash.a
index eaa0b5a..d2330c9 100644
--- a/pkg/darwin_amd64_race/hash.a
+++ b/pkg/darwin_amd64_race/hash.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/hash/adler32.a b/pkg/darwin_amd64_race/hash/adler32.a
index 12c31d1..7b1a505 100644
--- a/pkg/darwin_amd64_race/hash/adler32.a
+++ b/pkg/darwin_amd64_race/hash/adler32.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/hash/crc32.a b/pkg/darwin_amd64_race/hash/crc32.a
index bc66b38..e265067 100644
--- a/pkg/darwin_amd64_race/hash/crc32.a
+++ b/pkg/darwin_amd64_race/hash/crc32.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/hash/crc64.a b/pkg/darwin_amd64_race/hash/crc64.a
index 96ed3a3..192b264 100644
--- a/pkg/darwin_amd64_race/hash/crc64.a
+++ b/pkg/darwin_amd64_race/hash/crc64.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/hash/fnv.a b/pkg/darwin_amd64_race/hash/fnv.a
index 1833b12..fe6655c 100644
--- a/pkg/darwin_amd64_race/hash/fnv.a
+++ b/pkg/darwin_amd64_race/hash/fnv.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/html.a b/pkg/darwin_amd64_race/html.a
index 7d9cdd5..59fb9c8 100644
--- a/pkg/darwin_amd64_race/html.a
+++ b/pkg/darwin_amd64_race/html.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/html/template.a b/pkg/darwin_amd64_race/html/template.a
index bfbc3bb..323775e 100644
--- a/pkg/darwin_amd64_race/html/template.a
+++ b/pkg/darwin_amd64_race/html/template.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image.a b/pkg/darwin_amd64_race/image.a
index a7f223a..f17bfe8 100644
--- a/pkg/darwin_amd64_race/image.a
+++ b/pkg/darwin_amd64_race/image.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/color.a b/pkg/darwin_amd64_race/image/color.a
index 3c0ad00..1edc828 100644
--- a/pkg/darwin_amd64_race/image/color.a
+++ b/pkg/darwin_amd64_race/image/color.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/color/palette.a b/pkg/darwin_amd64_race/image/color/palette.a
index f595f79..e1ece52 100644
--- a/pkg/darwin_amd64_race/image/color/palette.a
+++ b/pkg/darwin_amd64_race/image/color/palette.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/draw.a b/pkg/darwin_amd64_race/image/draw.a
index b4bdb27..dd40093 100644
--- a/pkg/darwin_amd64_race/image/draw.a
+++ b/pkg/darwin_amd64_race/image/draw.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/gif.a b/pkg/darwin_amd64_race/image/gif.a
index 7b8da13..a5669de 100644
--- a/pkg/darwin_amd64_race/image/gif.a
+++ b/pkg/darwin_amd64_race/image/gif.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/internal/imageutil.a b/pkg/darwin_amd64_race/image/internal/imageutil.a
index 7f6170b..491dc65 100644
--- a/pkg/darwin_amd64_race/image/internal/imageutil.a
+++ b/pkg/darwin_amd64_race/image/internal/imageutil.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/jpeg.a b/pkg/darwin_amd64_race/image/jpeg.a
index 5ccae43..64ad80a 100644
--- a/pkg/darwin_amd64_race/image/jpeg.a
+++ b/pkg/darwin_amd64_race/image/jpeg.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/image/png.a b/pkg/darwin_amd64_race/image/png.a
index 7f4ba9a..8050e43 100644
--- a/pkg/darwin_amd64_race/image/png.a
+++ b/pkg/darwin_amd64_race/image/png.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/index/suffixarray.a b/pkg/darwin_amd64_race/index/suffixarray.a
index d10a140..a2a04ce 100644
--- a/pkg/darwin_amd64_race/index/suffixarray.a
+++ b/pkg/darwin_amd64_race/index/suffixarray.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/internal/format.a b/pkg/darwin_amd64_race/internal/format.a
index 927bff4..38e2106 100644
--- a/pkg/darwin_amd64_race/internal/format.a
+++ b/pkg/darwin_amd64_race/internal/format.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/internal/singleflight.a b/pkg/darwin_amd64_race/internal/singleflight.a
index d3e42d8..3dfb12b 100644
--- a/pkg/darwin_amd64_race/internal/singleflight.a
+++ b/pkg/darwin_amd64_race/internal/singleflight.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/internal/testenv.a b/pkg/darwin_amd64_race/internal/testenv.a
index 1d42aaf..3c9aee1 100644
--- a/pkg/darwin_amd64_race/internal/testenv.a
+++ b/pkg/darwin_amd64_race/internal/testenv.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/internal/trace.a b/pkg/darwin_amd64_race/internal/trace.a
index 809d527..c58d5bf 100644
--- a/pkg/darwin_amd64_race/internal/trace.a
+++ b/pkg/darwin_amd64_race/internal/trace.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/io.a b/pkg/darwin_amd64_race/io.a
index 1e46254..7b2d802 100644
--- a/pkg/darwin_amd64_race/io.a
+++ b/pkg/darwin_amd64_race/io.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/io/ioutil.a b/pkg/darwin_amd64_race/io/ioutil.a
index a3a1468..f2a8057 100644
--- a/pkg/darwin_amd64_race/io/ioutil.a
+++ b/pkg/darwin_amd64_race/io/ioutil.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/log.a b/pkg/darwin_amd64_race/log.a
index b93da16..bc4e2af 100644
--- a/pkg/darwin_amd64_race/log.a
+++ b/pkg/darwin_amd64_race/log.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/log/syslog.a b/pkg/darwin_amd64_race/log/syslog.a
index 422e846..49fd07c 100644
--- a/pkg/darwin_amd64_race/log/syslog.a
+++ b/pkg/darwin_amd64_race/log/syslog.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/math.a b/pkg/darwin_amd64_race/math.a
index 7cb827e..07f2ce0 100644
--- a/pkg/darwin_amd64_race/math.a
+++ b/pkg/darwin_amd64_race/math.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/math/big.a b/pkg/darwin_amd64_race/math/big.a
index d549249..70389f3 100644
--- a/pkg/darwin_amd64_race/math/big.a
+++ b/pkg/darwin_amd64_race/math/big.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/math/cmplx.a b/pkg/darwin_amd64_race/math/cmplx.a
index eade56b..fe101a9 100644
--- a/pkg/darwin_amd64_race/math/cmplx.a
+++ b/pkg/darwin_amd64_race/math/cmplx.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/math/rand.a b/pkg/darwin_amd64_race/math/rand.a
index d40967d..deb76d4 100644
--- a/pkg/darwin_amd64_race/math/rand.a
+++ b/pkg/darwin_amd64_race/math/rand.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/mime.a b/pkg/darwin_amd64_race/mime.a
index d693a8b..b5dab2b 100644
--- a/pkg/darwin_amd64_race/mime.a
+++ b/pkg/darwin_amd64_race/mime.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/mime/multipart.a b/pkg/darwin_amd64_race/mime/multipart.a
index e81cd91..c99299d 100644
--- a/pkg/darwin_amd64_race/mime/multipart.a
+++ b/pkg/darwin_amd64_race/mime/multipart.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/mime/quotedprintable.a b/pkg/darwin_amd64_race/mime/quotedprintable.a
index b9bc6eb..3d60354 100644
--- a/pkg/darwin_amd64_race/mime/quotedprintable.a
+++ b/pkg/darwin_amd64_race/mime/quotedprintable.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net.a b/pkg/darwin_amd64_race/net.a
index 03ac09c..0cec1ef 100644
--- a/pkg/darwin_amd64_race/net.a
+++ b/pkg/darwin_amd64_race/net.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http.a b/pkg/darwin_amd64_race/net/http.a
index ca92b8a..a3665ed 100644
--- a/pkg/darwin_amd64_race/net/http.a
+++ b/pkg/darwin_amd64_race/net/http.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/cgi.a b/pkg/darwin_amd64_race/net/http/cgi.a
index 8ca9b7d..223d642 100644
--- a/pkg/darwin_amd64_race/net/http/cgi.a
+++ b/pkg/darwin_amd64_race/net/http/cgi.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/cookiejar.a b/pkg/darwin_amd64_race/net/http/cookiejar.a
index a627a51..f6e88ac 100644
--- a/pkg/darwin_amd64_race/net/http/cookiejar.a
+++ b/pkg/darwin_amd64_race/net/http/cookiejar.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/fcgi.a b/pkg/darwin_amd64_race/net/http/fcgi.a
index 2590131..d5e3bad 100644
--- a/pkg/darwin_amd64_race/net/http/fcgi.a
+++ b/pkg/darwin_amd64_race/net/http/fcgi.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/httptest.a b/pkg/darwin_amd64_race/net/http/httptest.a
index 891fa26..fd0384f 100644
--- a/pkg/darwin_amd64_race/net/http/httptest.a
+++ b/pkg/darwin_amd64_race/net/http/httptest.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/httputil.a b/pkg/darwin_amd64_race/net/http/httputil.a
index 8636ffc..2924e35 100644
--- a/pkg/darwin_amd64_race/net/http/httputil.a
+++ b/pkg/darwin_amd64_race/net/http/httputil.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/internal.a b/pkg/darwin_amd64_race/net/http/internal.a
index 83aa811..74407bd 100644
--- a/pkg/darwin_amd64_race/net/http/internal.a
+++ b/pkg/darwin_amd64_race/net/http/internal.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/http/pprof.a b/pkg/darwin_amd64_race/net/http/pprof.a
index 1dbb438..269ef17 100644
--- a/pkg/darwin_amd64_race/net/http/pprof.a
+++ b/pkg/darwin_amd64_race/net/http/pprof.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/internal/socktest.a b/pkg/darwin_amd64_race/net/internal/socktest.a
index 751deb9..398fd31 100644
--- a/pkg/darwin_amd64_race/net/internal/socktest.a
+++ b/pkg/darwin_amd64_race/net/internal/socktest.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/mail.a b/pkg/darwin_amd64_race/net/mail.a
index 5681714..37e4dd1 100644
--- a/pkg/darwin_amd64_race/net/mail.a
+++ b/pkg/darwin_amd64_race/net/mail.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/rpc.a b/pkg/darwin_amd64_race/net/rpc.a
index 0df3fdd..4b8234b 100644
--- a/pkg/darwin_amd64_race/net/rpc.a
+++ b/pkg/darwin_amd64_race/net/rpc.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/rpc/jsonrpc.a b/pkg/darwin_amd64_race/net/rpc/jsonrpc.a
index 56efb34..1b63322 100644
--- a/pkg/darwin_amd64_race/net/rpc/jsonrpc.a
+++ b/pkg/darwin_amd64_race/net/rpc/jsonrpc.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/smtp.a b/pkg/darwin_amd64_race/net/smtp.a
index 33543f2..8e813fa 100644
--- a/pkg/darwin_amd64_race/net/smtp.a
+++ b/pkg/darwin_amd64_race/net/smtp.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/textproto.a b/pkg/darwin_amd64_race/net/textproto.a
index ad137ed..81c1dbd 100644
--- a/pkg/darwin_amd64_race/net/textproto.a
+++ b/pkg/darwin_amd64_race/net/textproto.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/net/url.a b/pkg/darwin_amd64_race/net/url.a
index a9d8a5a..eabb7b7 100644
--- a/pkg/darwin_amd64_race/net/url.a
+++ b/pkg/darwin_amd64_race/net/url.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/os.a b/pkg/darwin_amd64_race/os.a
index 9fd006f..e29728b 100644
--- a/pkg/darwin_amd64_race/os.a
+++ b/pkg/darwin_amd64_race/os.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/os/exec.a b/pkg/darwin_amd64_race/os/exec.a
index b224c52..38f9f5d 100644
--- a/pkg/darwin_amd64_race/os/exec.a
+++ b/pkg/darwin_amd64_race/os/exec.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/os/signal.a b/pkg/darwin_amd64_race/os/signal.a
index 789058e..f892739 100644
--- a/pkg/darwin_amd64_race/os/signal.a
+++ b/pkg/darwin_amd64_race/os/signal.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/os/user.a b/pkg/darwin_amd64_race/os/user.a
index 34bdf72..ab9b921 100644
--- a/pkg/darwin_amd64_race/os/user.a
+++ b/pkg/darwin_amd64_race/os/user.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/path.a b/pkg/darwin_amd64_race/path.a
index 09ccfce..b02df54 100644
--- a/pkg/darwin_amd64_race/path.a
+++ b/pkg/darwin_amd64_race/path.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/path/filepath.a b/pkg/darwin_amd64_race/path/filepath.a
index 0f56802..1a158e1 100644
--- a/pkg/darwin_amd64_race/path/filepath.a
+++ b/pkg/darwin_amd64_race/path/filepath.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/reflect.a b/pkg/darwin_amd64_race/reflect.a
index 027f327..76e28ea 100644
--- a/pkg/darwin_amd64_race/reflect.a
+++ b/pkg/darwin_amd64_race/reflect.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/regexp.a b/pkg/darwin_amd64_race/regexp.a
index f377049..7b6df16 100644
--- a/pkg/darwin_amd64_race/regexp.a
+++ b/pkg/darwin_amd64_race/regexp.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/regexp/syntax.a b/pkg/darwin_amd64_race/regexp/syntax.a
index 76179d8..798ba2d 100644
--- a/pkg/darwin_amd64_race/regexp/syntax.a
+++ b/pkg/darwin_amd64_race/regexp/syntax.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime.a b/pkg/darwin_amd64_race/runtime.a
index c66cb23..c2b12a7 100644
--- a/pkg/darwin_amd64_race/runtime.a
+++ b/pkg/darwin_amd64_race/runtime.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime/cgo.a b/pkg/darwin_amd64_race/runtime/cgo.a
index 0249698..b671325 100644
--- a/pkg/darwin_amd64_race/runtime/cgo.a
+++ b/pkg/darwin_amd64_race/runtime/cgo.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime/debug.a b/pkg/darwin_amd64_race/runtime/debug.a
index 87ad2fa..decc42f 100644
--- a/pkg/darwin_amd64_race/runtime/debug.a
+++ b/pkg/darwin_amd64_race/runtime/debug.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime/pprof.a b/pkg/darwin_amd64_race/runtime/pprof.a
index 0dbb2cf..cfa67ac 100644
--- a/pkg/darwin_amd64_race/runtime/pprof.a
+++ b/pkg/darwin_amd64_race/runtime/pprof.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime/race.a b/pkg/darwin_amd64_race/runtime/race.a
index b5640ea..c608ec9 100644
--- a/pkg/darwin_amd64_race/runtime/race.a
+++ b/pkg/darwin_amd64_race/runtime/race.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/runtime/trace.a b/pkg/darwin_amd64_race/runtime/trace.a
index 5c00246..cc391f2 100644
--- a/pkg/darwin_amd64_race/runtime/trace.a
+++ b/pkg/darwin_amd64_race/runtime/trace.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/sort.a b/pkg/darwin_amd64_race/sort.a
index 6d6f0ff..ccec692 100644
--- a/pkg/darwin_amd64_race/sort.a
+++ b/pkg/darwin_amd64_race/sort.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/strconv.a b/pkg/darwin_amd64_race/strconv.a
index 030988f..f4aed39 100644
--- a/pkg/darwin_amd64_race/strconv.a
+++ b/pkg/darwin_amd64_race/strconv.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/strings.a b/pkg/darwin_amd64_race/strings.a
index 057fac9..ebcfde3 100644
--- a/pkg/darwin_amd64_race/strings.a
+++ b/pkg/darwin_amd64_race/strings.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/sync.a b/pkg/darwin_amd64_race/sync.a
index ceeb77f..20d8073 100644
--- a/pkg/darwin_amd64_race/sync.a
+++ b/pkg/darwin_amd64_race/sync.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/sync/atomic.a b/pkg/darwin_amd64_race/sync/atomic.a
index b505935..9a6170f 100644
--- a/pkg/darwin_amd64_race/sync/atomic.a
+++ b/pkg/darwin_amd64_race/sync/atomic.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/syscall.a b/pkg/darwin_amd64_race/syscall.a
index 6410bde..eeb9e2f 100644
--- a/pkg/darwin_amd64_race/syscall.a
+++ b/pkg/darwin_amd64_race/syscall.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/testing.a b/pkg/darwin_amd64_race/testing.a
index 46bb3f7..378fce2 100644
--- a/pkg/darwin_amd64_race/testing.a
+++ b/pkg/darwin_amd64_race/testing.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/testing/iotest.a b/pkg/darwin_amd64_race/testing/iotest.a
index 4725e70..573f121 100644
--- a/pkg/darwin_amd64_race/testing/iotest.a
+++ b/pkg/darwin_amd64_race/testing/iotest.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/testing/quick.a b/pkg/darwin_amd64_race/testing/quick.a
index e471648..077fab2 100644
--- a/pkg/darwin_amd64_race/testing/quick.a
+++ b/pkg/darwin_amd64_race/testing/quick.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/text/scanner.a b/pkg/darwin_amd64_race/text/scanner.a
index b5e8063..d10f1f0 100644
--- a/pkg/darwin_amd64_race/text/scanner.a
+++ b/pkg/darwin_amd64_race/text/scanner.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/text/tabwriter.a b/pkg/darwin_amd64_race/text/tabwriter.a
index 500f154..66bd6bc 100644
--- a/pkg/darwin_amd64_race/text/tabwriter.a
+++ b/pkg/darwin_amd64_race/text/tabwriter.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/text/template.a b/pkg/darwin_amd64_race/text/template.a
index 50fb83a..a421182 100644
--- a/pkg/darwin_amd64_race/text/template.a
+++ b/pkg/darwin_amd64_race/text/template.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/text/template/parse.a b/pkg/darwin_amd64_race/text/template/parse.a
index dccc051..e758ea6 100644
--- a/pkg/darwin_amd64_race/text/template/parse.a
+++ b/pkg/darwin_amd64_race/text/template/parse.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/time.a b/pkg/darwin_amd64_race/time.a
index bb00159..d406b4e 100644
--- a/pkg/darwin_amd64_race/time.a
+++ b/pkg/darwin_amd64_race/time.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/unicode.a b/pkg/darwin_amd64_race/unicode.a
index ff1498a..65100dc 100644
--- a/pkg/darwin_amd64_race/unicode.a
+++ b/pkg/darwin_amd64_race/unicode.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/unicode/utf16.a b/pkg/darwin_amd64_race/unicode/utf16.a
index aa72387..a97e529 100644
--- a/pkg/darwin_amd64_race/unicode/utf16.a
+++ b/pkg/darwin_amd64_race/unicode/utf16.a
Binary files differ
diff --git a/pkg/darwin_amd64_race/unicode/utf8.a b/pkg/darwin_amd64_race/unicode/utf8.a
index 0deac1d..3e3bb9b 100644
--- a/pkg/darwin_amd64_race/unicode/utf8.a
+++ b/pkg/darwin_amd64_race/unicode/utf8.a
Binary files differ
diff --git a/pkg/tool/darwin_amd64/addr2line b/pkg/tool/darwin_amd64/addr2line
index 2d36c2c..c70d4af 100755
--- a/pkg/tool/darwin_amd64/addr2line
+++ b/pkg/tool/darwin_amd64/addr2line
Binary files differ
diff --git a/pkg/tool/darwin_amd64/api b/pkg/tool/darwin_amd64/api
index 94b3fa8..8dbf61a 100755
--- a/pkg/tool/darwin_amd64/api
+++ b/pkg/tool/darwin_amd64/api
Binary files differ
diff --git a/pkg/tool/darwin_amd64/asm b/pkg/tool/darwin_amd64/asm
index b564e9f..779d8e9 100755
--- a/pkg/tool/darwin_amd64/asm
+++ b/pkg/tool/darwin_amd64/asm
Binary files differ
diff --git a/pkg/tool/darwin_amd64/cgo b/pkg/tool/darwin_amd64/cgo
index d843643..2c45887 100755
--- a/pkg/tool/darwin_amd64/cgo
+++ b/pkg/tool/darwin_amd64/cgo
Binary files differ
diff --git a/pkg/tool/darwin_amd64/compile b/pkg/tool/darwin_amd64/compile
index 200306f..a305a61 100755
--- a/pkg/tool/darwin_amd64/compile
+++ b/pkg/tool/darwin_amd64/compile
Binary files differ
diff --git a/pkg/tool/darwin_amd64/cover b/pkg/tool/darwin_amd64/cover
index a82bddc..7ffe95e 100755
--- a/pkg/tool/darwin_amd64/cover
+++ b/pkg/tool/darwin_amd64/cover
Binary files differ
diff --git a/pkg/tool/darwin_amd64/dist b/pkg/tool/darwin_amd64/dist
index 9c61824..e1a313c 100755
--- a/pkg/tool/darwin_amd64/dist
+++ b/pkg/tool/darwin_amd64/dist
Binary files differ
diff --git a/pkg/tool/darwin_amd64/doc b/pkg/tool/darwin_amd64/doc
index 8fdb9f1..ac6044b 100755
--- a/pkg/tool/darwin_amd64/doc
+++ b/pkg/tool/darwin_amd64/doc
Binary files differ
diff --git a/pkg/tool/darwin_amd64/fix b/pkg/tool/darwin_amd64/fix
index 1e8cd5b..75f1c83 100755
--- a/pkg/tool/darwin_amd64/fix
+++ b/pkg/tool/darwin_amd64/fix
Binary files differ
diff --git a/pkg/tool/darwin_amd64/link b/pkg/tool/darwin_amd64/link
index 37961bc..d07d10f 100755
--- a/pkg/tool/darwin_amd64/link
+++ b/pkg/tool/darwin_amd64/link
Binary files differ
diff --git a/pkg/tool/darwin_amd64/nm b/pkg/tool/darwin_amd64/nm
index 450faee..d1bc3ff 100755
--- a/pkg/tool/darwin_amd64/nm
+++ b/pkg/tool/darwin_amd64/nm
Binary files differ
diff --git a/pkg/tool/darwin_amd64/objdump b/pkg/tool/darwin_amd64/objdump
index 6453bb6..7fa71e7 100755
--- a/pkg/tool/darwin_amd64/objdump
+++ b/pkg/tool/darwin_amd64/objdump
Binary files differ
diff --git a/pkg/tool/darwin_amd64/pack b/pkg/tool/darwin_amd64/pack
index a67c324..3f399a1 100755
--- a/pkg/tool/darwin_amd64/pack
+++ b/pkg/tool/darwin_amd64/pack
Binary files differ
diff --git a/pkg/tool/darwin_amd64/pprof b/pkg/tool/darwin_amd64/pprof
index b9e5642..497ac74 100755
--- a/pkg/tool/darwin_amd64/pprof
+++ b/pkg/tool/darwin_amd64/pprof
Binary files differ
diff --git a/pkg/tool/darwin_amd64/trace b/pkg/tool/darwin_amd64/trace
index bff7482..68b43cf 100755
--- a/pkg/tool/darwin_amd64/trace
+++ b/pkg/tool/darwin_amd64/trace
Binary files differ
diff --git a/pkg/tool/darwin_amd64/vet b/pkg/tool/darwin_amd64/vet
index 9d93b26..63714ce 100755
--- a/pkg/tool/darwin_amd64/vet
+++ b/pkg/tool/darwin_amd64/vet
Binary files differ
diff --git a/pkg/tool/darwin_amd64/yacc b/pkg/tool/darwin_amd64/yacc
index cbf0577..af2e978 100755
--- a/pkg/tool/darwin_amd64/yacc
+++ b/pkg/tool/darwin_amd64/yacc
Binary files differ
diff --git a/src/cmd/internal/obj/zbootstrap.go b/src/cmd/internal/obj/zbootstrap.go
index 96eb879..bbe3e01 100644
--- a/src/cmd/internal/obj/zbootstrap.go
+++ b/src/cmd/internal/obj/zbootstrap.go
@@ -4,7 +4,7 @@
 
 import "runtime"
 
-const defaultGOROOT = `/tmp/go`
+const defaultGOROOT = `./prebuilts/go/darwin-x86`
 const defaultGO386 = `sse2`
 const defaultGOARM = `7`
 const defaultGOOS = runtime.GOOS
diff --git a/src/runtime/zversion.go b/src/runtime/zversion.go
index f013571..0cad34f 100644
--- a/src/runtime/zversion.go
+++ b/src/runtime/zversion.go
@@ -2,7 +2,7 @@
 
 package runtime
 
-const defaultGoroot = `/tmp/go`
+const defaultGoroot = `./prebuilts/go/darwin-x86`
 const theVersion = `go1.5.1`
 const goexperiment = ``
 const stackGuardMultiplier = 1