Revert of [android] Stop using isolate.py for data dependency management.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index a203ce069e5bc4760c2a84be3808e1aae3fb94f6..7398f62c79c7b8654bf31ce2bb3f2a81cb1b6445 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
@@ -66,6 +66,14 @@ class LocalDeviceInstrumentationTestRun(
 
   #override
   def SetUp(self):
+    def substitute_device_root(d, device_root):
+      if not d:
+        return device_root
+      elif isinstance(d, list):
+        return posixpath.join(*(p if p else device_root for p in d))
+      else:
+        return d
+
     @local_device_environment.handle_shard_failures_with(
         self._env.BlacklistDevice)
     def individual_device_set_up(dev, host_device_tuples):
@@ -109,7 +117,7 @@ class LocalDeviceInstrumentationTestRun(
         device_root = posixpath.join(dev.GetExternalStoragePath(),
                                      'chromium_tests_root')
         host_device_tuples_substituted = [
-            (h, local_device_test_run.SubstituteDeviceRoot(d, device_root))
+            (h, substitute_device_root(d, device_root))
             for h, d in host_device_tuples]
         logging.info('instrumentation data deps:')
         for h, d in host_device_tuples_substituted: