Reland "[infra] Roll Infra dep to update CIPD packages" with fix

This reverts commit 8cb7c3be75a7bedadef0d89ab93cd5b79c0ae255.

Just leave Win7 Golo tasks on python 2.

Change-Id: Idf1d6cc6d303107afd8e74cdec94e7a9ec91399e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/416316
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/go.mod b/go.mod
index c0df5cb..c243318 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,6 @@
 	cloud.google.com/go/pubsub v1.8.3 // indirect
 	cloud.google.com/go/storage v1.12.0
 	github.com/99designs/goodies v0.0.0-20140916053233-ec7f410f2ff2 // indirect
-	github.com/Azure/go-autorest v11.1.2+incompatible // indirect
 	github.com/GeertJohan/go.rice v1.0.0 // indirect
 	github.com/Microsoft/go-winio v0.4.15 // indirect
 	github.com/OneOfOne/struct2ts v1.0.4 // indirect
@@ -30,7 +29,6 @@
 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
 	github.com/jackc/pgx v3.2.0+incompatible // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
-	github.com/kisielk/errcheck v1.4.0 // indirect
 	github.com/klauspost/compress v1.11.3 // indirect
 	github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
@@ -49,15 +47,12 @@
 	github.com/yosuke-furukawa/json5 v0.1.1 // indirect
 	go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect
 	go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
-	go.skia.org/infra v0.0.0-20210516052255-1a8ff8585fce
+	go.skia.org/infra v0.0.0-20210604150202-e9a7516eb634
 	go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect
 	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
 	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
-	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
-	golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	google.golang.org/api v0.35.0
 	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4 // indirect