Revert "build: roll infra_paths changes"

scripts/slave/recipes/infra/luci_gae.py

 # Copyright 2015 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.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'depot_tools/git',
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/properties',
   'recipe_engine/python',
   'depot_tools/tryserver',
 ]
 
 
 def _run_presubmit(api, patch_root, bot_update_step):
   upstream = bot_update_step.json.output['properties'].get(
       api.gclient.c.got_revision_mapping[
       'infra/go/src/github.com/luci/gae'])
   # The presubmit must be run with proper Go environment.
   # infra/go/env.py takes care of this.
   presubmit_cmd = [
     'python',  # env.py will replace with this its sys.executable.
-    api.infra_paths['depot_tools'].join('presubmit_support.py'),
-    '--root', api.infra_paths['slave_build'].join(patch_root),
+    api.path['depot_tools'].join('presubmit_support.py'),
+    '--root', api.path['slave_build'].join(patch_root),
     '--commit',
     '--verbose', '--verbose',
     '--issue', api.properties['issue'],
     '--patchset', api.properties['patchset'],
     '--skip_canned', 'CheckRietveldTryJobExecution',
     '--skip_canned', 'CheckTreeIsOpen',
     '--skip_canned', 'CheckBuildbotPendingBuilds',
     '--rietveld_url', api.properties['rietveld'],
     '--rietveld_fetch',
     '--upstream', upstream,
     '--rietveld_email', ''
   ]
   api.python('presubmit', api.path['checkout'].join('go', 'env.py'),
              presubmit_cmd, env={'PRESUBMIT_BUILDER': '1'})
 
 
 def _commit_change(api, patch_root):
   api.git('-c', 'user.email=commit-bot@chromium.org',
           '-c', 'user.name=The Commit Bot',
           'commit', '-a', '-m', 'Committed patch',
           name='commit git patch',
-          cwd=api.infra_paths['slave_build'].join(patch_root))
+          cwd=api.path['slave_build'].join(patch_root))
 
 
 def RunSteps(api):
   api.gclient.set_config('luci_gae')
   # patch_root must match the luci/gae repo, not infra checkout.
   for path in api.gclient.c.got_revision_mapping:
     if 'github.com/luci/gae' in path:
       patch_root = path
       break
   bot_update_step = api.bot_update.ensure_checkout(force=True,
@@ skipping 35 matching lines @@
         repository='https://chromium.googlesource.com/external/github.com/luci/gae',
     )
   )
   yield (
     api.test('presubmit_try_job') +
     api.properties.tryserver(
         mastername='tryserver.infra',
         buildername='Luci-GAE Presubmit',
     ) + api.step_data('presubmit', api.json.output([[]]))
   )