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

buildbot/slave/skia_slave_scripts/prerender.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Prepare runtime resources that are needed by Test builders but not
     Bench builders. """
 
 from build_step import BuildStep
 from utils import shell_utils
@@ skipping 95 matching lines @@
       print 'Pushing GM expectations from %s on host to %s on device...' % (
           temp_gm_expectations_path, device_gm_expectations_path)
       self._flavor_utils.PushFileToDevice(temp_gm_expectations_path,
                                           device_gm_expectations_path)
       shutil.rmtree(tempdir)
 
     # Prepare directory to hold GM actuals.
     self._flavor_utils.CreateCleanHostDirectory(self._gm_actual_dir)
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._flavor_utils.DevicePathJoin(self._device_dirs.GMActualDir(),
-                                          self._gm_image_subdir))
+                                          self._builder_name))
     self._flavor_utils.CreateCleanHostDirectory(
         self._local_playback_dirs.PlaybackGmActualDir())
     self._flavor_utils.CreateCleanDeviceDirectory(self._device_dirs.SKPOutDir())
 
     # Copy expectations file and images to decode in skimage to device.
     self._flavor_utils.CopyDirectoryContentsToDevice(
         self._skimage_expected_dir, self._device_dirs.SKImageExpectedDir())
 
     self._flavor_utils.CopyDirectoryContentsToDevice(
         self._skimage_in_dir, self._device_dirs.SKImageInDir())
 
 
     # Create a directory for the output of skimage
     self._flavor_utils.CreateCleanHostDirectory(self._skimage_out_dir)
     self._flavor_utils.CreateCleanDeviceDirectory(
         self._device_dirs.SKImageOutDir())
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(PreRender))