Revert of Switch chromium.perf Android Nexus5X over to chromium recipe

masters/master.chromium.perf/master.cfg

Index: masters/master.chromium.perf/master.cfg
diff --git a/masters/master.chromium.perf/master.cfg b/masters/master.chromium.perf/master.cfg
index ec0b78d0cb8897a99fc70c95f2183dc81163c959..4213711ebde2ce2d55ae0228669f716367d6033d 100644
--- a/masters/master.chromium.perf/master.cfg
+++ b/masters/master.chromium.perf/master.cfg
@@ -160,15 +160,13 @@
     _trigger_testers[trigger_name].append(name)
 
 
-def _AddTester(name, platform, num_shards=1, target_bits=64, recipe=None):
+def _AddTester(name, platform, num_shards=1, target_bits=64):
   if platform == 'android':
-    recipe = recipe or 'android/perf'
+    factory = m_remote_run_chromium_src('android/perf')
     bb_trigger = True
   else:
-    recipe = recipe or 'chromium'
+    factory = m_remote_run_chromium_src('chromium')
     bb_trigger = False
-
-  factory = m_remote_run_chromium_src(recipe)
 
   if num_shards == 1:
     _AddTesterShard(name, factory, platform, target_bits, bb_trigger=bb_trigger)
@@ -195,7 +193,7 @@
 
 _AddTester('Android Galaxy S5 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus5 Perf', 'android', num_shards=3, target_bits=32)
-_AddTester('Android Nexus5X Perf', 'android', num_shards=3, recipe='chromium')
+_AddTester('Android Nexus5X Perf', 'android', num_shards=3)
 _AddTester('Android Nexus6 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus7v2 Perf', 'android', num_shards=3, target_bits=32)
 _AddTester('Android Nexus9 Perf', 'android', num_shards=3)