Update NexusPlayers to O Preview 2

This may help with NexusPlayers flaking out.

Bug: skia:6045
NOTRY=true
Change-Id: I1ac1bf3cb5e17d26069082da7cb0f420865c9630
Reviewed-on: https://skia-review.googlesource.com/17388
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/android_map.json b/infra/bots/android_map.json
index f20f6cd..938eae4 100644
--- a/infra/bots/android_map.json
+++ b/infra/bots/android_map.json
@@ -15,7 +15,7 @@
   "Nexus6p":         ["angler",      "OPP1.170223.012"],
   "Nexus7":          ["grouper",     "LMY47V"],
   "Nexus7v2":        ["flo",         "M"],
-  "NexusPlayer":     ["fugu",        "OPP1.170223.012"],
+  "NexusPlayer":     ["fugu",        "OPP2.170420.017"],
   "Pixel":           ["sailfish",    "NMF26Q"],
   "PixelC":          ["dragon",      "N2G47D"],
   "PixelXL":         ["marlin",      "NMF26Q"]
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index c9e5922..87e7b6c 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5465,7 +5465,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -5499,7 +5499,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -5533,7 +5533,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11474,7 +11474,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11508,7 +11508,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11542,7 +11542,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11576,7 +11576,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11610,7 +11610,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"
@@ -11644,7 +11644,7 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:OPP1.170223.012",
+        "device_os:OPP2.170420.017",
         "device_type:fugu",
         "os:Android",
         "pool:Skia"