Revert "build: roll infra_paths changes"

scripts/slave/recipes/mojo.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.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/python',
   'recipe_engine/step',
   'depot_tools/tryserver',
   'url',
 ]
 
@@ skipping 18 matching lines @@
     args += ['--asan']
 
   if api.tryserver.is_tryserver:
     args += ['--dcheck_always_on']
 
   goma_dir = ''
   if 'Win' not in buildername:
     # Disable Goma on Windows as it makes the build much slower (> 1 hour vs
     # 15 minutes). Try renabling once we have trybots and the cache would be
     # warm.
-    goma_dir = api.infra_paths['build'].join('goma')
+    goma_dir = api.path['build'].join('goma')
   env = {}
 
   if is_debug:
     build_type = "--debug"
   elif is_official:
     build_type = "--official"
   else:
     build_type = "--release"
 
   if goma_dir:
     env['GOMA_DIR'] = goma_dir
   api.python('mojob gn',
              mojob_path,
              args=['gn', build_type] + args + gn_args,
              cwd=api.path['checkout'],
              env=env)
   api.python('mojob build',
              mojob_path,
              args=['build', build_type] + args,
              env=env)
 
 
 def _DeviceCheckStep(api):
-  devices_path = api.m.infra_paths['build'].join('site_config', '.known_devices')
+  devices_path = api.m.path['build'].join('site_config', '.known_devices')
   args = [
       '--json-output', api.json.output(),
       '--restart-usb',
       '--known-devices-file', devices_path,
   ]
   try:
     result = api.python(
         'device_status_check',
         api.path['checkout'].join('build', 'android', 'buildbot',
                               'bb_device_status_check.py'),
@@ skipping 163 matching lines @@
               "serial": "07a00ca4",
               "type": "flo"
           }]))
     yield test
   yield(api.test('mojo_linux_try') +
       api.properties.tryserver(buildername="Mojo Linux Try"))
   yield(api.test('mojo_android_builder_tests_dbg_fail_device_check') +
       api.properties.tryserver(buildername="Mojo Android Builder Tests (dbg)") +
       api.step_data("device_status_check", retcode=1))