Revert of Skia recipe: Use [depot_tools]/gsutil.py instead of [depot_tools]/third_party/gsutil/gsuti

infra/bots/recipes/swarm_trigger.py

 # Copyright 2016 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.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import os
 import json
@@ skipping 463 matching lines @@
     api.file.makedirs('perf_dir', perf_data_dir, infra_step=True)
     src_results_file = task.task_output_dir.join(
         '0', 'perfdata', api.properties['buildername'], 'data',
         'nanobench_%s.json' % got_revision)
     dst_results_file = perf_data_dir.join(
         'nanobench_%s_%s.json' % (got_revision, git_timestamp))
     api.file.copy('perf_results', src_results_file, dst_results_file,
                   infra_step=True)
 
     gsutil_path = api.path['slave_build'].join(
-        'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'gsutil.py')
+        'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party',
+        'gsutil', 'gsutil')
     upload_args = [api.properties['buildername'], api.properties['buildnumber'],
                    perf_data_dir, got_revision, gsutil_path]
     if is_trybot:
       upload_args.append(get_issue_num(api))
     api.python(
         'Upload perf results',
         script=api.core.resource('upload_bench_results.py'),
         args=upload_args,
         cwd=api.path['checkout'],
         infra_step=True)
@@ skipping 308 matching lines @@
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           revision='abc123',
           **gerrit_kwargs) +
       api.step_data(
           'upload new .isolated file for test_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated'))
   )