[devil] Use AdbWrapper.GetAdbPath in devil.android.forwarder

devil/devil/android/forwarder.py

Index: devil/devil/android/forwarder.py
diff --git a/devil/devil/android/forwarder.py b/devil/devil/android/forwarder.py
index 9f6ed01a845e9347857224700ba32d4ac41cc103..244f555af4f75db5a6b7a037adf9188b6585c0d3 100644
--- a/devil/devil/android/forwarder.py
+++ b/devil/devil/android/forwarder.py
@@ -13,6 +13,7 @@ from devil import base_error
 from devil import devil_env
 from devil.android import device_errors
 from devil.android.constants import file_system
+from devil.android.sdk import adb_wrapper
 from devil.android.valgrind_tools import base_tool
 from devil.utils import cmd_helper
 
@@ -130,7 +131,7 @@ class Forwarder(object):
 
       device_serial = str(device)
       map_arg_lists = [
-          ['--adb=' + devil_env.config.FetchPath('adb'),
+          ['--adb=' + adb_wrapper.AdbWrapper.GetAdbPath(),
            '--serial-id=' + device_serial,
            '--map', str(device_port), str(host_port)]
           for device_port, host_port in port_pairs]
@@ -203,7 +204,7 @@ class Forwarder(object):
       instance = Forwarder._GetInstanceLocked(None)
       unmap_all_cmd = [
           instance._host_forwarder_path,
-          '--adb=%s' % devil_env.config.FetchPath('adb'),
+          '--adb=%s' % adb_wrapper.AdbWrapper.GetAdbPath(),
           '--serial-id=%s' % device.serial,
           '--unmap-all'
       ]
@@ -307,7 +308,7 @@ class Forwarder(object):
 
     unmap_cmd = [
         instance._host_forwarder_path,
-        '--adb=%s' % devil_env.config.FetchPath('adb'),
+        '--adb=%s' % adb_wrapper.AdbWrapper.GetAdbPath(),
         '--serial-id=%s' % serial,
         '--unmap', str(device_port)
     ]