Drop release on chromium.webrtc, tweak fyi.

This didn't end up quite right. I didn't realize chromium.webrtc
doesn't have any debug bots, so I removed that category. Also
sorted fyi debug-release consistently.

Bug: chromium:840277
Change-Id: Ie8d174fa99504e576a78c75363bed8f10bb854ac
Reviewed-on: https://chromium-review.googlesource.com/1049687Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557123}

infra/config/global/luci-milo-dev.cfg

@@ -3017,52 +3017,52 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.webrtc/Linux Builder"
-    category: "linux|release"
+    category: "linux"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Linux Tester"
-    category: "linux|release"
+    category: "linux"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Builder"
-    category: "mac|release"
+    category: "mac"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Tester"
-    category: "mac|release"
+    category: "mac"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Tester (long-running)"
-    category: "mac|release"
-    short_name: "long"
+    category: "mac"
+    short_name: "lng"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win Builder"
-    category: "win|release"
+    category: "win"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win10 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "10"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win7 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "7"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win7 Tester (long-running)"
-    category: "win|release"
+    category: "win"
     short_name: "lng"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win8 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "8"
   }
 }
@@ -3075,11 +3075,6 @@ consoles: {
   manifest_name: "REVISION"
   header_id: "chromium"
 
-  builders: {
-    name: "buildbot/chromium.webrtc.fyi/Android Builder"
-    category: "android|release"
-    short_name: "32"
-  }
   builders: {
     name: "buildbot/chromium.webrtc.fyi/Android Builder (dbg)"
     category: "android|debug|builder"
@@ -3100,6 +3095,11 @@ consoles: {
     category: "android|debug|tester"
     short_name: "M"
   }
+  builders: {
+    name: "buildbot/chromium.webrtc.fyi/Android Builder"
+    category: "android|release"
+    short_name: "32"
+  }
   builders: {
     name: "buildbot/chromium.webrtc.fyi/Linux Builder (dbg)"
     category: "linux|debug"
@@ -3116,13 +3116,13 @@ consoles: {
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder"
-    category: "mac|release"
+    name: "buildbot/chromium.webrtc.fyi/Mac Builder (dbg)"
+    category: "mac|debug"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder (dbg)"
-    category: "mac|debug"
+    name: "buildbot/chromium.webrtc.fyi/Mac Builder"
+    category: "mac|release"
     short_name: "bld"
   }
   builders: {

infra/config/global/luci-milo.cfg

@@ -3331,52 +3331,52 @@ consoles: {
 
   builders: {
     name: "buildbot/chromium.webrtc/Linux Builder"
-    category: "linux|release"
+    category: "linux"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Linux Tester"
-    category: "linux|release"
+    category: "linux"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Builder"
-    category: "mac|release"
+    category: "mac"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Tester"
-    category: "mac|release"
+    category: "mac"
     short_name: "tst"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Mac Tester (long-running)"
-    category: "mac|release"
-    short_name: "long"
+    category: "mac"
+    short_name: "lng"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win Builder"
-    category: "win|release"
+    category: "win"
     short_name: "bld"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win10 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "10"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win7 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "7"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win7 Tester (long-running)"
-    category: "win|release"
+    category: "win"
     short_name: "lng"
   }
   builders: {
     name: "buildbot/chromium.webrtc/Win8 Tester"
-    category: "win|release"
+    category: "win"
     short_name: "8"
   }
 }
@@ -3389,11 +3389,6 @@ consoles: {
   manifest_name: "REVISION"
   header_id: "chromium"
 
-  builders: {
-    name: "buildbot/chromium.webrtc.fyi/Android Builder"
-    category: "android|release"
-    short_name: "32"
-  }
   builders: {
     name: "buildbot/chromium.webrtc.fyi/Android Builder (dbg)"
     category: "android|debug|builder"
@@ -3414,6 +3409,11 @@ consoles: {
     category: "android|debug|tester"
     short_name: "M"
   }
+  builders: {
+    name: "buildbot/chromium.webrtc.fyi/Android Builder"
+    category: "android|release"
+    short_name: "32"
+  }
   builders: {
     name: "buildbot/chromium.webrtc.fyi/Linux Builder (dbg)"
     category: "linux|debug"
@@ -3430,13 +3430,13 @@ consoles: {
     short_name: "tst"
   }
   builders: {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder"
-    category: "mac|release"
+    name: "buildbot/chromium.webrtc.fyi/Mac Builder (dbg)"
+    category: "mac|debug"
     short_name: "bld"
   }
   builders: {
-    name: "buildbot/chromium.webrtc.fyi/Mac Builder (dbg)"
-    category: "mac|debug"
+    name: "buildbot/chromium.webrtc.fyi/Mac Builder"
+    category: "mac|release"
     short_name: "bld"
   }
   builders: {