Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/adb/api.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.
 
 from recipe_engine import recipe_api
 
 class AdbApi(recipe_api.RecipeApi):
   def __init__(self, **kwargs):
     super(AdbApi, self).__init__(**kwargs)
     self._custom_adb_path = None
     self._devices = None
 
   def __call__(self, cmd, serial=None, **kwargs):
     """Run an ADB command."""
     cmd_prefix = [self.adb_path()]
     if serial:
       cmd_prefix.extend(['-s', serial])
     return self.m.step(cmd=cmd_prefix + cmd, **kwargs)
 
   def set_adb_path(self, adb_path):
     self._custom_adb_path = adb_path
 
   def adb_path(self):
     if self._custom_adb_path:
       return self._custom_adb_path
-    return self.m.infra_paths['slave_build'].join(
+    return self.m.path['slave_build'].join(
         'src', 'third_party', 'android_tools', 'sdk', 'platform-tools', 'adb')
 
   def adb_dir(self):
     return self.m.path.dirname(self.adb_path())
 
   def list_devices(self, step_test_data=None, **kwargs):
     cmd = [
         str(self.adb_path()),
         'devices',
     ]
@@ skipping 22 matching lines @@
         import sys
         adb_path = sys.argv[1]
         for device in sys.argv[2:]:
           print 'Attempting to root device %s ...' % (device)
           subprocess.check_call([adb_path, '-s', device, 'root'])
           subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])
           print 'Finished rooting device %s' % (device)
         """,
         args=[self.adb_path()] + self.devices,
         **kwargs)