Revert of Include isolate.py in data for Android unit tests

build/android/BUILD.gn

Index: build/android/BUILD.gn
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index af819ed3ce62c8e4cb3482e4f6b787177e8687e5..73b25cde9299a7c4789948d992dd4816a1c9b67d 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -84,25 +84,30 @@
   ]
 }
 
+group("devil_py") {
+  data = [
+    "devil_chromium.json",
+    "devil_chromium.py",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
+    "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
+    "//third_party/android_tools/sdk/platform-tools/adb",
+    "//third_party/catapult/catapult_base/catapult_base/",
+    "//third_party/catapult/dependency_manager/dependency_manager/",
+    "//third_party/catapult/third_party/gsutil/",
+    "//third_party/catapult/devil/devil/",
+  ]
+}
+
 group("test_runner_py") {
-  _py_files = read_file("test_runner.pydeps", "list lines")
-
-  # Filter out comments.
-  set_sources_assignment_filter([ "#*" ])
-  sources = _py_files
-
-  data = sources + [
-           "devil_chromium.json",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/aapt",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/dexdump",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/lib/libc++.so",
-           "//third_party/android_tools/sdk/build-tools/23.0.1/split-select",
-           "//third_party/android_tools/sdk/platform-tools/adb",
-           "//third_party/catapult/third_party/gsutil/",
-           "//third_party/catapult/devil/devil/devil_dependencies.json",
-         ]
+  data = [
+    "test_runner.py",
+    "pylib/",
+    "//build/util/lib/common/",
+  ]
   data_deps = [
-    "//tools/swarming_client:isolate_py",
+    ":devil_py",
   ]
 }