Revert "build: roll infra_paths changes"

scripts/slave/recipe_modules/skia/android_flavor.py

 # Copyright 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.
 
 
 import android_devices
 import copy
 import default_flavor
 
 
@@ skipping 47 matching lines @@
     return self._android_flavor._skia_api.run(self._adb, *args, **kwargs)
 
 
 class AndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
   def __init__(self, skia_api):
     super(AndroidFlavorUtils, self).__init__(skia_api)
     self.device = self._skia_api.builder_spec['device_cfg']
     slave_info = android_devices.SLAVE_INFO.get(
         self._skia_api.slave_name,
         android_devices.SLAVE_INFO['default'])
-    self.android_bin = self._skia_api.m.infra_paths['slave_build'].join(
+    self.android_bin = self._skia_api.m.path['slave_build'].join(
         'skia', 'platform_tools', 'android', 'bin')
     self._android_sdk_root = slave_info.android_sdk_root
     self.serial = slave_info.serial
     self.serial_args = ['-s', slave_info.serial]
     if self._skia_api.running_in_swarming:
       self._android_sdk_root = android_devices.SWARMING_SDK_ROOT
       self.serial = None
       self.serial_args = []
     self._adb = _ADBWrapper(
         self._skia_api.m.adb,
@@ skipping 190 matching lines @@
     ).stdout.rstrip()
     prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dir=prefix + 'skp/skps',
         tmp_dir=prefix + 'tmp_dir')