[Android] Fix device file push location

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index c407ffd692d741cd6f5328ddc932d230d7725c81..5a031bec1ed71d8843b46ec9a74203d72fffe56e 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -835,8 +835,8 @@ class AndroidCommands(object):
     # only a single file is given as the base name given in device_path may
     # differ from that in host_path.
     def HostToDevicePath(host_file_path):
-      return os.path.join(os.path.dirname(device_path), os.path.relpath(
-          host_file_path, os.path.dirname(os.path.normpath(host_path))))
+      return os.path.join(device_path, os.path.relpath(
+          host_file_path, os.path.normpath(host_path)))
 
     device_hashes = [h.hash for h in device_hash_tuples]
     return [(t.path, HostToDevicePath(t.path) if os.path.isdir(host_path) else