Revert "build: roll infra_paths changes"

scripts/slave/recipes/libvpx/android_unittests.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.
 
 from recipe_engine.types import freeze
 
 DEPS = [
     'depot_tools/git',
-    'depot_tools/infra_paths',
     'recipe_engine/json',
     'recipe_engine/path',
     'perf_dashboard',
     'recipe_engine/platform',
     'recipe_engine/properties',
     'recipe_engine/python',
     'recipe_engine/raw_io',
     'recipe_engine/step',
 ]
 
@@ skipping 17 matching lines @@
 
 from recipe_engine.recipe_api import Property
 
 PROPERTIES = {
   'libvpx_git_url': Property(),
   'buildername': Property(),
 }
 
 def RunSteps(api, libvpx_git_url, buildername):
   # Paths and other constants
-  build_root = api.infra_paths['slave_build']
+  build_root = api.path['slave_build']
 
   # Android tools DEPS
   android_tools_root = build_root.join('android_tools')
   adb = android_tools_root.join('sdk', 'platform-tools', 'adb')
   ndk_root = android_tools_root.join('ndk')
 
   # libvpx paths
   libvpx_root = build_root.join('libvpx')
   test_data = build_root.join('test_data')
 
@@ skipping 43 matching lines @@
 
   test_root = libvpx_root.join('test')
   api.python(
       'get_files', test_root.join('android', 'get_files.py'),
       args=[
           '-i', test_root.join('test-data.sha1'),
           '-o', test_data, '-u', TEST_FILES_URL])
 
   api.python(
       'transfer_files',
-      api.infra_paths['build'].join('scripts', 'slave', 'android',
+      api.path['build'].join('scripts', 'slave', 'android',
                              'transfer_files.py'),
       args=[adb, DEVICE_ROOT, test_data])
 
   lib_root = build_root.join('libs', 'armeabi-v7a')
   api.step('push_so', [adb, 'push', lib_root, DEVICE_ROOT])
 
   step_result = api.python.inline(
       'adb_wrap', r"""
           import sys, subprocess, time
           out = open(sys.argv[1], "w")
@@ skipping 88 matching lines @@
                     "encodeTimeSecs": 56.277676,
                     "speed" : 5,
                     "minPsnr" : 43.5,
                     "framesPerSecond": 317.976883,
                     "threadCount": 2,
                     "totalFrames": 17895,
                     "version": "v1.3.0-2045-g38c2d37",
                     "videoName": "vp90-2-bbb_640x360_tile_1x2_337kbps.webm"
                  }
             ])))