Cleanup TODO in gen_tasks

It is well after December 2017

Bug: skia:
Change-Id: I3e48735dac9885606bdecab301379a1312966ff1
Reviewed-on: https://skia-review.googlesource.com/114361
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>

2 files changed, 127 insertions, 260 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 6b7985698d..5b9016565f 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -252,12 +252,6 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 			}
 			d["device_type"] = deviceInfo[0]
 			d["device_os"] = deviceInfo[1]
-			// TODO(kjlubick): Remove the python dimension after we have removed the
-			// Nexus5x devices from the local lab (on Monday, Dec 11, 2017 should be fine).
-			d["python"] = "2.7.9" // This indicates a RPI, e.g. in Skolo.  Golo is 2.7.12
-			if parts["model"] == "Nexus5x" {
-				d["python"] = "2.7.12"
-			}
 		} else if strings.Contains(parts["os"], "iOS") {
 			device, ok := map[string]string{
 				"iPadMini4": "iPad5,1",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index b3b616b8f3..94e5ab069e 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -6666,8 +6666,7 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6701,8 +6700,7 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6736,8 +6734,7 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6771,8 +6768,7 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6806,8 +6802,7 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6841,8 +6836,7 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6876,8 +6870,7 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6911,8 +6904,7 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6946,8 +6938,7 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -6981,8 +6972,7 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7016,8 +7006,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7051,8 +7040,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7086,8 +7074,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7121,8 +7108,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7156,8 +7142,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7191,8 +7176,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7226,8 +7210,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7261,8 +7244,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7296,8 +7278,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7331,8 +7312,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7366,8 +7346,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7401,8 +7380,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7436,8 +7414,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7471,8 +7448,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7506,8 +7482,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7541,8 +7516,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7576,8 +7550,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7611,8 +7584,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7646,8 +7618,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7681,8 +7652,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7716,8 +7686,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7751,8 +7720,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7786,8 +7754,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7821,8 +7788,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7856,8 +7822,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -7891,8 +7856,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -7926,8 +7890,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -7961,8 +7924,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -7996,8 +7958,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8031,8 +7992,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8066,8 +8026,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8101,8 +8060,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8134,8 +8092,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8167,8 +8124,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8202,8 +8158,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8235,8 +8190,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8270,8 +8224,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8305,8 +8258,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8340,8 +8292,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8375,8 +8326,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8408,8 +8358,7 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8441,8 +8390,7 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8474,8 +8422,7 @@
         "device_os:OPR1.170623.034",
         "device_type:dragon",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8915,8 +8862,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8948,8 +8894,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -8981,8 +8926,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -9014,8 +8958,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15124,8 +15067,7 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15160,8 +15102,7 @@
         "device_os:MOB30Q",
         "device_type:sprout",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15196,8 +15137,7 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15232,8 +15172,7 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15268,8 +15207,7 @@
         "device_os:NRD90M_G920TUVU5FQK1",
         "device_type:zerofltetmo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15304,8 +15242,7 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15340,8 +15277,7 @@
         "device_os:NRD90M_G930AUCS4BQC2",
         "device_type:heroqlteatt",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15376,8 +15312,7 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15412,8 +15347,7 @@
         "device_os:NRD90M_G930FXXU1DQAS",
         "device_type:herolte",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15448,8 +15382,7 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15484,8 +15417,7 @@
         "device_os:NPJ25.93-14",
         "device_type:athene",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15520,8 +15452,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15556,8 +15487,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15592,8 +15522,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15628,8 +15557,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15664,8 +15592,7 @@
         "device_os:NRD90M_1915764_848",
         "device_type:foster",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15700,8 +15627,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15736,8 +15662,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15772,8 +15697,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15808,8 +15732,7 @@
         "device_os:M4B30Z_3437181",
         "device_type:hammerhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15844,8 +15767,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15880,8 +15802,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15917,8 +15838,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15953,8 +15873,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -15989,8 +15908,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16026,8 +15944,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16062,8 +15979,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16098,8 +16014,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16134,8 +16049,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16170,8 +16084,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16206,8 +16119,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16243,8 +16155,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16280,8 +16191,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16316,8 +16226,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16352,8 +16261,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16388,8 +16296,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16424,8 +16331,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16460,8 +16366,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16496,8 +16401,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16532,8 +16436,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16568,8 +16471,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16605,8 +16507,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16642,8 +16543,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16678,8 +16578,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16714,8 +16613,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16750,8 +16648,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16786,8 +16683,7 @@
         "device_os:OPR6.170623.023",
         "device_type:bullhead",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.12"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16822,8 +16718,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16858,8 +16753,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16894,8 +16788,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16930,8 +16823,7 @@
         "device_os:LMY47V_1836172",
         "device_type:grouper",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -16966,8 +16858,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -17002,8 +16893,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17038,8 +16928,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -17074,8 +16963,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
@@ -17110,8 +16998,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17146,8 +17033,7 @@
         "device_os:OPR6.170623.021",
         "device_type:fugu",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17182,8 +17068,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17218,8 +17103,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17254,8 +17138,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17290,8 +17173,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17326,8 +17208,7 @@
         "device_os:OPM1.171019.016",
         "device_type:sailfish",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17362,8 +17243,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17398,8 +17278,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17434,8 +17313,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17470,8 +17348,7 @@
         "device_os:OPD1.170816.023",
         "device_type:taimen",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17924,8 +17801,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17958,8 +17834,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -17992,8 +17867,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
@@ -18026,8 +17900,7 @@
         "device_os:1.30_109591",
         "device_type:chorizo",
         "os:Android",
-        "pool:Skia",
-        "python:2.7.9"
+        "pool:Skia"
       ],
       "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,