Use new common utils where possible.

slave/skia_slave_scripts/flavor_utils/android_build_step_utils.py

 # Copyright (c) 2013 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.
 
 """ Utilities for Android build steps. """
 
 from default_build_step_utils import DefaultBuildStepUtils, DeviceDirs
-from utils import android_utils
+from py.utils import android_utils
 from utils import gs_utils
-from utils import shell_utils
+from py.utils import shell_utils
 
 import os
 import posixpath
 import time
 
 
 class AndroidBuildStepUtils(DefaultBuildStepUtils):
   def __init__(self, build_step_instance):
     DefaultBuildStepUtils.__init__(self, build_step_instance)
     self._device = self._step.args['device']
@@ skipping 150 matching lines @@
           skimage_in_dir=prefix + 'skimage_in',
           skimage_expected_dir=prefix + 'skimage_expected',
           skimage_out_dir=prefix + 'skimage_out',
           skp_dir=prefix + 'skp',
           skp_perf_dir=prefix + 'skp_perf',
           playback_actual_images_dir=prefix + 'playback_actual_images',
           playback_actual_summaries_dir=prefix + 'playback_actual_summaries',
           playback_expected_summaries_dir=(
               prefix + 'playback_expected_summaries'),
           tmp_dir=prefix + 'tmp_dir')