Android Loading Tools: use computed adb path for cert install

tools/android/loading/device_setup.py

Index: tools/android/loading/device_setup.py
diff --git a/tools/android/loading/device_setup.py b/tools/android/loading/device_setup.py
index 954ae09342a8a16d8c9ee3269027179b3b5ac33c..9d92af307e7084778ebefa5a963457d5d85d6251 100644
--- a/tools/android/loading/device_setup.py
+++ b/tools/android/loading/device_setup.py
@@ -20,6 +20,7 @@ sys.path.append(os.path.join(_CATAPULT_DIR, 'devil'))
 from devil.android import device_utils
 from devil.android import flag_changer
 from devil.android import forwarder
+from devil.android.sdk import adb_wrapper
 from devil.android.sdk import intent
 
 sys.path.append(os.path.join(_SRC_DIR, 'build', 'android'))
@@ -215,7 +216,7 @@ def _WprHost(wpr_archive_path, record=False,
     if os.path.exists(out_log_path):
       os.remove(out_log_path)
 
-  # Set up WPR server and device forwarder.
+#Set up WPR server and device forwarder.

[Benoit L, 2017/03/02 09:43:08]

nit: remove this from the diff.

[mattcary, 2017/03/02 09:55:16]

oops, thanks

   server = wpr_server.ReplayServer(PathWorkaround(wpr_archive_path),
       '127.0.0.1', 0, 0, None, wpr_server_args)
   http_port, https_port = server.StartServer()[:-1]
@@ -318,7 +319,8 @@ def RemoteWprHost(device, wpr_archive_path, record=False,
   certutils.write_dummy_ca_cert(*certutils.generate_dummy_ca_cert(),
                                 cert_path=wpr_ca_cert_path)
   device_cert_util = adb_install_cert.AndroidCertInstaller(
-      device.adb.GetDeviceSerial(), None, wpr_ca_cert_path)
+      device.adb.GetDeviceSerial(), None, wpr_ca_cert_path,
+      adb_wrapper.AdbWrapper.GetAdbPath())
   device_cert_util.install_cert(overwrite_cert=True)
   try:
     # Set up WPR server