Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/skia/appurify_flavor.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.
 
 
 import android_devices
 import copy
 import default_flavor
 
 
 """Appurify flavor utils, used for building and running tests in Appurify."""
 
 
 class AppurifyFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(AppurifyFlavorUtils, self).__init__(skia_api)
     self.build_cfg = self._skia_api.builder_spec['device_cfg']
     self.device = self._skia_api.builder_spec['builder_cfg']['model']
     slave_info = android_devices.SLAVE_INFO.get(
         self._skia_api.slave_name,
         android_devices.SLAVE_INFO['default'])
-    self.android_tools = self._skia_api.m.infra_paths['slave_build'].join(
+    self.android_tools = self._skia_api.m.path['slave_build'].join(
         'skia', 'platform_tools', 'android')
     self.android_bin = self.android_tools.join('bin')
     self.apk_dir = self.android_tools.join('apps', 'visualbench', 'build',
                                            'outputs', 'apk')
     self.assets_dir = self.android_tools.join('apps', 'visualbench', 'src',
                                               'main', 'assets')
     self._android_sdk_root = slave_info.android_sdk_root
     self._default_env = {'ANDROID_SDK_ROOT': self._android_sdk_root,
                          'ANDROID_HOME': self._android_sdk_root,
                          'SKIA_ANDROID_VERBOSE_SETUP': 1}
@@ skipping 93 matching lines @@
     """Set the directories which will be used by the build steps."""
     sdcard = '/sdcard'
     results_dir = sdcard + '/skia_results'
     return default_flavor.DeviceDirs(
         dm_dir=results_dir,
         perf_data_dir=results_dir,
         resource_dir=sdcard + '/resources',
         images_dir=sdcard + '/images',
         skp_dir=sdcard + '/skps',
         tmp_dir=sdcard + '/tmp')