Upgrade GT610 to Win 10 Creators Update.

Bug: 777523
No-Try: true
Change-Id: I0b9fe60c571dd9a96d6fd27c74071ef1809b4da5
Reviewed-on: https://skia-review.googlesource.com/66158
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index c337d77..91427e3 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -200,10 +200,6 @@
 		if !ok {
 			glog.Fatalf("Entry %q not found in OS mapping.", os)
 		}
-		// These machines have a different Windows image.
-		if parts["model"] == "Golo" && os == "Win10" && parts["cpu_or_gpu_value"] == "GT610" {
-			d["os"] = "Windows-10-10586"
-		}
 	} else {
 		d["os"] = DEFAULT_OS_DEBIAN
 	}
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 47f705a..ce3febd 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -10706,7 +10706,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-22.21.13.8205",
-        "os:Windows-10-10586",
+        "os:Windows-10-15063",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
@@ -19906,7 +19906,7 @@
       ],
       "dimensions": [
         "gpu:10de:104a-22.21.13.8205",
-        "os:Windows-10-10586",
+        "os:Windows-10-15063",
         "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,