Use new common utils where possible.

slave/skia_slave_scripts/update_skp_version.py

 # Copyright (c) 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.
 
 """Create a CL to update the SKP version."""
 
 
 import os
 import re
 import sys
 import time
 
 from build_step import BuildStep
 from config_private import SKIA_GIT_URL
-from utils.git_utils import GIT
-from utils import misc
-from utils import shell_utils
+from py.utils.git_utils import GIT
+from py.utils import misc
+from py.utils import shell_utils
 
 
 CHROMIUM_SKIA = 'https://chromium.googlesource.com/skia.git'
 COMMIT_MSG = '''Update SKP version to %s
 
 Automatic commit by the RecreateSKPs bot.
 
 TBR=
 '''
 PATH_TO_SKIA = os.path.join('third_party', 'skia')
@@ skipping 61 matching lines @@
         wait()
         while not bexpect.all_trybots_finished(codereview_url):
           wait()
 
         # Add trybot results as new expectations.
         bexpect.gen_bench_expectations_from_codereview(codereview_url)
 
 
 if '__main__' == __name__:
   sys.exit(BuildStep.RunBuildStep(UpdateSkpVersion))