diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index 81995d373..01fff0651 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -6,6 +6,12 @@
 #
 # Please keep this list sorted by bucket name.
 
+builder_mixins {
+  name: "android"
+  mixins: "linux"
+  dimensions: "device_type:bullhead"
+}
+
 builder_mixins {
   name: "linux"
   dimensions: "os:Ubuntu-14.04"
@@ -95,15 +101,15 @@ buckets {
     }
     builders {
       name: "Android Tester ARM32 Debug (Nexus 5X)"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "Android Tester ARM32 Release (Nexus 5X)"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "Android Tester ARM64 Debug (Nexus 5X)"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "Android32 MIPS Debug"
@@ -244,11 +250,11 @@ buckets {
 
     builders {
       name: "android"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "android_arm64"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "android_mips"
@@ -256,7 +262,7 @@ buckets {
     }
     builders {
       name: "android_rel"
-      mixins: "linux"
+      mixins: "android"
     }
     builders {
       name: "android_x64"