Add 8.1.0 and 9.0.0 builders on master

Change-Id: I11584e49fc2717c0f98bb1395202e8a82751d76b
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index e472c7c..2f2cc4f 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -287,6 +287,25 @@
       }
     }
     builders {
+      name: "linux-android-8.1.0"
+      mixins: "linux"
+      mixins: "normal"
+      recipe {
+        properties: "tool:r8"
+        properties: "dex_vm:8.1.0"
+      }
+    }
+
+    builders {
+      name: "linux-android-9.0.0"
+      mixins: "linux"
+      mixins: "normal"
+      recipe {
+        properties: "tool:r8"
+        properties: "dex_vm:9.0.0"
+      }
+    }
+    builders {
       name: "linux-internal"
       mixins: "linux"
       mixins: "internal"
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index a830e6f..62b9104 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -42,6 +42,16 @@
     short_name: "7.0.0"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-8.1.0"
+    category: "R8"
+    short_name: "8.1.0"
+  }
+  builders {
+    name: "buildbucket/luci.r8.ci/linux-android-9.0.0"
+    category: "R8"
+    short_name: "9.0.0"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-internal"
     category: "R8"
     short_name: "internal"
@@ -197,6 +207,16 @@
     short_name: "7.0.0"
   }
   builders {
+    name: "buildbucket/luci.r8.ci/linux-android-8.1.0"
+    category: "R8"
+    short_name: "8.1.0"
+  }
+  builders {
+    name: "buildbucket/luci.r8.ci/linux-android-9.0.0"
+    category: "R8"
+    short_name: "9.0.0"
+  }
+  builders {
     name: "buildbucket/luci.r8.ci/linux-internal"
     category: "R8"
     short_name: "internal"
diff --git a/infra/config/global/luci-notify.cfg b/infra/config/global/luci-notify.cfg
index 58bad4c..27fc752 100644
--- a/infra/config/global/luci-notify.cfg
+++ b/infra/config/global/luci-notify.cfg
@@ -113,6 +113,16 @@
     repository: "https://r8.googlesource.com/r8"
   }
   builders {
+    name: "linux-android-8.1.0"
+    bucket: "ci"
+    repository: "https://r8.googlesource.com/r8"
+  }
+  builders {
+    name: "linux-android-9.0.0"
+    bucket: "ci"
+    repository: "https://r8.googlesource.com/r8"
+  }
+  builders {
     name: "linux-android-7.0.0_release"
     bucket: "ci"
     repository: "https://r8.googlesource.com/r8"
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 4625b17..32254f2 100644
--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -30,6 +30,9 @@
   triggers: "linux-android-5.1.1"
   triggers: "linux-android-6.0.1"
   triggers: "linux-android-7.0.0"
+  triggers: "linux-android-8.1.0"
+  triggers: "linux-android-9.0.0"
+
   triggers: "linux-internal"
   triggers: "linux-jctf"
   triggers: "r8cf-linux-jctf"
@@ -278,6 +281,32 @@
 }
 
 job {
+  id: "linux-android-8.1.0"
+  acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.r8.ci"
+    builder: "linux-android-8.1.0"
+  }
+}
+
+job {
+  id: "linux-android-9.0.0"
+  acl_sets: "default"
+  triggering_policy: {
+    max_concurrent_invocations: 2
+  }
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.r8.ci"
+    builder: "linux-android-9.0.0"
+  }
+}
+
+job {
   id: "linux-internal"
   acl_sets: "default"
   buildbucket {