Revert of [Skia] Convert Sk Images to a CIPD package

scripts/slave/recipe_modules/skia/default_flavor.py

 # Copyright 2014 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.
 
 
 """Default flavor utils class, used for desktop builders."""
 
 
 import json
 
@@ skipping 194 matching lines @@
     """Run any device-specific cleanup steps."""
     pass
 
   def get_device_dirs(self):
     """ Set the directories which will be used by the build steps.
 
     These refer to paths on the same device where the test executables will
     run, for example, for Android bots these are paths on the Android device
     itself. For desktop bots, these are just local paths.
     """
+    pardir = self._skia_api.m.path.pardir
+    join = self._skia_api.slave_dir.join
     return DeviceDirs(
         dm_dir=self._skia_api.dm_dir,
         perf_data_dir=self._skia_api.perf_data_dir,
         resource_dir=self._skia_api.resource_dir,
-        images_dir=self._skia_api.images_dir,
+        images_dir=join('images'),
         skp_dir=self._skia_api.local_skp_dir,
-        tmp_dir=self._skia_api.tmp_dir)
+        tmp_dir=join('tmp'))
 
   def __repr__(self):
     return '<%s object>' % self.__class__.__name__  # pragma: no cover