Manual partial update from from https://crrev.com/337502

build/android/pylib/base/base_setup.py

Index: build/android/pylib/base/base_setup.py
diff --git a/build/android/pylib/base/base_setup.py b/build/android/pylib/base/base_setup.py
index 0b0daf13e5c9e0317ebe430dcab22862ce37bca2..a416380a949a28b97f6463a0a5315824c57a88b5 100644
--- a/build/android/pylib/base/base_setup.py
+++ b/build/android/pylib/base/base_setup.py
@@ -59,7 +59,5 @@ def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path,
 def PushDataDeps(device, device_dir, test_options):
   valgrind_tools.PushFilesForTool(test_options.tool, device)
   if os.path.exists(constants.ISOLATE_DEPS_DIR):
-    device.PushChangedFiles([
-        (os.path.join(constants.ISOLATE_DEPS_DIR, p),
-         '%s/%s' % (device_dir, p))
-        for p in os.listdir(constants.ISOLATE_DEPS_DIR)])
+    device.PushChangedFiles([(constants.ISOLATE_DEPS_DIR, device_dir)],
+                            delete_device_stale=test_options.delete_stale_data)