Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -898,6 +898,11 @@
            'builddir': "sanitizer-x86_64-linux-fuzzer",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
+           {'name': "sanitizer-x86_64-linux-android",
+           'slavenames' :["sanitizer-buildbot6"],
+           'builddir': "sanitizer-x86_64-linux-android",
+           'factory': SanitizerBuilder.getSanitizerBuildFactory()},
+
           {'name': "sanitizer-ppc64be-linux",
            'slavenames' :["ppc64be-sanitizer"],
            'builddir': "sanitizer-ppc64be",
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -136,6 +136,8 @@
         create_slave("sanitizer-buildbot4", properties={'jobs': 8}, max_builds=1),
         # Debian 7.7 x86_64 8-core GCE instance
         create_slave("sanitizer-buildbot5", properties={'jobs': 8}, max_builds=1),
+        # Ubuntu 14.04 x86_64 6-core z440 workstation
+        create_slave("sanitizer-buildbot6", properties={'jobs': 6}, max_builds=1),
 
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
@@ -21,6 +21,7 @@
     'sanitizer-x86_64-linux-fast': bash('buildbot_fast.sh'),
     'sanitizer-x86_64-linux-autoconf': bash('buildbot_standard.sh'),
     'sanitizer-x86_64-linux-fuzzer': bash('buildbot_fuzzer.sh'),
+    'sanitizer-x86_64-linux-android': bash('buildbot_android.sh'),
 }
 
 BOT_ADDITIONAL_ENV = {
@@ -31,6 +32,7 @@
     'sanitizer-x86_64-linux-fast': {},
     'sanitizer-x86_64-linux-autoconf': {},
     'sanitizer-x86_64-linux-fuzzer': {},
+    'sanitizer-x86_64-linux-android': {},
 }
 
 def Main():