Remove base-* directories from gm expected/actual paths; just use platform names

buildbot/master/skia_master_scripts/utils.py

Index: buildbot/master/skia_master_scripts/utils.py
===================================================================
--- buildbot/master/skia_master_scripts/utils.py	(revision 10693)
+++ buildbot/master/skia_master_scripts/utils.py	(working copy)
@@ -453,12 +453,10 @@
 
 
 def _MakeBuilder(helper, role, os, model, gpu, configuration, arch,
-                 gm_image_subdir, factory_type, extra_config=None,
+                 factory_type, extra_config=None,
                  perf_output_basedir=None, extra_branches=None, is_trybot=False,
                  **kwargs):
-  """ Creates a builder and scheduler.
-
-  TODO(epoger): gm_image_subdir is no longer used, should be removed."""
+  """ Creates a builder and scheduler."""
   B = helper.Builder
   F = helper.Factory
 
@@ -489,7 +487,6 @@
       builder_name=builder_name,
       other_subdirs=subdirs_to_checkout,
       configuration=configuration,
-      gm_image_subdir=gm_image_subdir,
       do_patch_step=is_trybot,
       perf_output_basedir=perf_output_basedir,
       **kwargs