Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/recipe_tryjob/api.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.
 
 import collections
 import hashlib
 import json
 import re
 
 from recipe_engine import recipe_api
@@ skipping 253 matching lines @@
     default, but which infra's python has installed."""
     return self.m.step(name, [
         self.m.path['checkout'].join('ENV', 'bin', 'python'),
         '-u', script] + args, **kwargs)
 
   def run_tryjob(self, patches_raw, rietveld, issue, patchset, patch_project):
     patches = parse_patches(
         self.m.python.failing_step, patches_raw, rietveld, issue, patchset,
         patch_project)
 
-    root_dir = self.m.infra_paths['slave_build']
+    root_dir = self.m.path['slave_build']
 
     # Needed to set up the infra checkout, for _python
     self.m.gclient.set_config('infra')
     self.m.gclient.c.solutions[0].revision = 'origin/master'
     self.m.gclient.checkout()
     self.m.gclient.runhooks()
 
     url_mapping = self.m.luci_config.get_projects()
 
     # TODO(martiniss): use luci-config smarter; get recipes.cfg directly, rather
@@ skipping 11 matching lines @@
 
     projs_to_test, locations = self._checkout_projects(
         all_projects, root_dir, url_mapping, downstream_projects, patches)
 
     with self.m.step.defer_results():
       for proj in projs_to_test:
         deps_locs = {dep: locations[dep] for dep in deps[proj]}
 
         self.simulation_test(
             proj, recipe_configs[proj], locations[proj], deps_locs)