[cr-buildbucket.cfg] Normalize builder dimensions for fyi-ci

* All Mac bots use Mac-10.13 as os.
* Android device bots use id:<bot name> as dimensions

Bug: 840631
Change-Id: I0ea523e0b4f1f91f20c7f32333ec2db6ab486b03
Reviewed-on: https://chromium-review.googlesource.com/1100070Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Ryan Tseng <hinoka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567055}

infra/config/global/cr-buildbucket.cfg

@@ -1428,7 +1428,7 @@ buckets {
     builders {
       name: "Android ChromeDriver Tests (dbg)"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "device_os:MOB31V"
+      dimensions: "id:build91-b1"
       mixins: "fyi-ci"
     }
     builders {
@@ -1463,7 +1463,7 @@ buckets {
     }
     builders {
       name: "Mac Builder (dbg) Goma Canary (clobber)"
-      dimensions: "os:Mac-10.12.6"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1521,7 +1521,7 @@ buckets {
     }
     builders {
       name: "Mac Goma Canary (clobber)"
-      dimensions: "os:Mac-10.12.2"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1531,7 +1531,7 @@ buckets {
     }
     builders {
       name: "Libfuzzer Upload Mac ASan"
-      dimensions: "os:Mac-10.13.3"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1609,7 +1609,7 @@ buckets {
     }
     builders {
       name: "Out of Process Profiling Mac"
-      dimensions: "os:Mac-10.12.5"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1630,8 +1630,7 @@ buckets {
     builders {
       name: "Android Remoting Tests"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "device_os:KOT49H"
-      dimensions: "devices:6"
+      dimensions: "id:build65-b1"
       mixins: "fyi-ci"
     }
     builders {
@@ -1661,7 +1660,7 @@ buckets {
     }
     builders {
       name: "Mac Goma Canary LocalOutputCache"
-      dimensions: "os:Mac"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1731,8 +1730,7 @@ buckets {
     }
     builders {
       name: "Mac deterministic"
-      dimensions: "os:Mac-10.12.2"
-      dimensions: "cores:16"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1773,7 +1771,7 @@ buckets {
     }
     builders {
       name: "Jumbo Mac"
-      dimensions: "os:Mac-10.12.5"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1783,7 +1781,7 @@ buckets {
     }
     builders {
       name: "Mac Builder (dbg) Goma Canary"
-      dimensions: "os:Mac-10.12.2"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1813,8 +1811,7 @@ buckets {
     }
     builders {
       name: "Mac deterministic (dbg)"
-      dimensions: "os:Mac-10.12.2"
-      dimensions: "cores:16"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1844,7 +1841,7 @@ buckets {
     }
     builders {
       name: "Chromium Mac 10.13"
-      dimensions: "os:Mac-10.13.2"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1950,7 +1947,7 @@ buckets {
     }
     builders {
       name: "mac-views-rel"
-      dimensions: "os:Mac-10.12.2"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -1966,8 +1963,7 @@ buckets {
     builders {
       name: "Android Find Annotated Test"
       dimensions: "os:Ubuntu-14.04"
-      dimensions: "device_os:KOT49H"
-      dimensions: "devices:6"
+      dimensions: "id:build65-b1"
       mixins: "fyi-ci"
     }
     builders {
@@ -2072,7 +2068,7 @@ buckets {
     }
     builders {
       name: "Mac Builder Goma Canary"
-      dimensions: "os:Mac-10.12.6"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {
@@ -2082,7 +2078,7 @@ buckets {
     }
     builders {
       name: "ios-device-goma-canary-clobber"
-      dimensions: "os:Mac"
+      dimensions: "os:Mac-10.13"
       mixins: "fyi-ci"
     }
     builders {