[test] Push binaries to separate folders on Android devices.

tools/run_perf.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Performance runner for d8.
 
 Call e.g. with tools/run-perf.py --arch ia32 some_suite.json
 
@@ skipping 565 matching lines @@
 
   def PreTests(self, node, path):
     suite_dir = os.path.abspath(os.path.dirname(path))
     if node.path:
       bench_rel = os.path.normpath(os.path.join(*node.path))
       bench_abs = os.path.join(suite_dir, bench_rel)
     else:
       bench_rel = "."
       bench_abs = suite_dir
 
-    self._PushFile(self.shell_dir, node.binary)
+    self._PushFile(self.shell_dir, node.binary, "bin")
 
     # Push external startup data. Backwards compatible for revisions where
     # these files didn't exist.
-    self._PushFile(self.shell_dir, "natives_blob.bin", skip_if_missing=True)
-    self._PushFile(self.shell_dir, "snapshot_blob.bin", skip_if_missing=True)
+    self._PushFile(
+        self.shell_dir,
+        "natives_blob.bin",
+        "bin",
+        skip_if_missing=True,
+    )
+    self._PushFile(
+        self.shell_dir,
+        "snapshot_blob.bin",
+        "bin",
+        skip_if_missing=True,
+    )
 
     if isinstance(node, Runnable):
       self._PushFile(bench_abs, node.main, bench_rel)
     for resource in node.resources:
       self._PushFile(bench_abs, resource, bench_rel)
 
   def Run(self, runnable, count):
     cache = cache_control.CacheControl(self.device)
     cache.DropRamCaches()
-    binary_on_device = AndroidPlatform.DEVICE_DIR + runnable.binary
+    binary_on_device = os.path.join(
+        AndroidPlatform.DEVICE_DIR, "bin", runnable.binary)
     cmd = [binary_on_device] + runnable.GetCommandFlags(self.extra_flags)
 
     # Relative path to benchmark directory.
     if runnable.path:
       bench_rel = os.path.normpath(os.path.join(*runnable.path))
     else:
       bench_rel = "."
 
     try:
       output = self.device.RunShellCommand(
@@ skipping 104 matching lines @@
 
   if options.json_test_results:
     results.WriteToFile(options.json_test_results)
   else:  # pragma: no cover
     print results
 
   return min(1, len(results.errors))
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(Main(sys.argv[1:]))