WebRTC: Configure more_configs recipe for new Android builders.

masters/master.client.webrtc/master_android_cfg.py

Index: masters/master.client.webrtc/master_android_cfg.py
diff --git a/masters/master.client.webrtc/master_android_cfg.py b/masters/master.client.webrtc/master_android_cfg.py
index a684f07538d60d09d2a3be32d178544808d79f0c..ea2461c361cd66e8b118fbfb1bc1ab00bdddc3b0 100644
--- a/masters/master.client.webrtc/master_android_cfg.py
+++ b/masters/master.client.webrtc/master_android_cfg.py
@@ -4,6 +4,7 @@
 
 from buildbot.schedulers.basic import SingleBranchScheduler
 
+from master.factory import annotator_factory
 from master.factory import remote_run_factory
 
 import master_site_config
@@ -19,6 +20,9 @@ def m_remote_run(recipe, **kwargs):
       **kwargs)
 
 
+m_annotator = annotator_factory.AnnotatorFactory()
+
+
 def Update(c):
   c['schedulers'].extend([
       SingleBranchScheduler(name='webrtc_android_scheduler',
@@ -54,13 +58,19 @@ def Update(c):
     {'name': 'Android64 Builder x64 (dbg)', 'slavebuilddir': 'android_x64'},
     {'name': 'Android32 GYP', 'slavebuilddir': 'android_gyp'},
     {'name': 'Android32 GYP (dbg)', 'slavebuilddir': 'android_gyp'},
-    {'name': 'Android32 (more configs)', 'slavebuilddir': 'android'},
+    {
+      'name': 'Android32 (more configs)',
+      'recipe': 'webrtc/more_configs',
+      'slavebuilddir': 'android',
+    },
   ]
 
   c['builders'].extend([
       {
         'name': spec['name'],
-        'factory': m_remote_run('webrtc/standalone'),
+        'factory': m_annotator.BaseFactory(spec['recipe'])
+                   if 'recipe' in spec
+                   else m_remote_run('webrtc/standalone'),
         'notify_on_missing': True,
         'category': 'android',
         'slavebuilddir': spec.get('slavebuilddir', 'android'),