Add Nexus 5X Vulkan bots to GPU.FYI MILO console

Also rearrange other Android GPU.FYI bots hierarchy.

BUG=808610

Change-Id: I8f959215b35e5759a759a5c96c0252cdd70c4d0a
Reviewed-on: https://chromium-review.googlesource.com/955951Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541928}

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

@@ -2780,40 +2780,50 @@ consoles: {
     category: "Linux"
     short_name: "tsn"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
-    category: "Android"
-    short_name: "nvi"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N5"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
-    category: "Android"
-    short_name: "N5X"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N6"
   }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
+    category: "Android|M64|QCOM"
+    short_name: "N5X"
+  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6P)"
-    category: "Android"
+    category: "Android|M64|QCOM"
     short_name: "N6P"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 9)"
-    category: "Android"
+    category: "Android|M64|NVDA"
     short_name: "N9"
   }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
+    category: "Android|N64|NVDA"
+    short_name: "STV"
+  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI dEQP Release (Nexus 5X)"
-    category: "Android"
-    short_name: "dqp"
+    category: "Android|dqp|M64"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 32 Vk Release (Nexus 5X)"
+    category: "Android|vk|O32"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 64 Vk Release (Nexus 5X)"
+    category: "Android|vk|O64"
+    short_name: "N5X"
   }
 }
 

infra/config/global/luci-milo.cfg

@@ -3168,40 +3168,50 @@ consoles: {
     category: "Linux"
     short_name: "tsn"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
-    category: "Android"
-    short_name: "nvi"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N5"
   }
-  builders: {
-    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
-    category: "Android"
-    short_name: "N5X"
-  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6)"
-    category: "Android"
+    category: "Android|L32"
     short_name: "N6"
   }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 5X)"
+    category: "Android|M64|QCOM"
+    short_name: "N5X"
+  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 6P)"
-    category: "Android"
+    category: "Android|M64|QCOM"
     short_name: "N6P"
   }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI Release (Nexus 9)"
-    category: "Android"
+    category: "Android|M64|NVDA"
     short_name: "N9"
   }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI Release (NVIDIA Shield TV)"
+    category: "Android|N64|NVDA"
+    short_name: "STV"
+  }
   builders: {
     name: "buildbot/chromium.gpu.fyi/Android FYI dEQP Release (Nexus 5X)"
-    category: "Android"
-    short_name: "dqp"
+    category: "Android|dqp|M64"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 32 Vk Release (Nexus 5X)"
+    category: "Android|vk|O32"
+    short_name: "N5X"
+  }
+  builders: {
+    name: "buildbot/chromium.gpu.fyi/Android FYI 64 Vk Release (Nexus 5X)"
+    category: "Android|vk|O64"
+    short_name: "N5X"
   }
 }