Android: start upstreaming some of our perf tests.

tools/chrome_remote_control/chrome_remote_control/adb_commands.py

Index: tools/chrome_remote_control/chrome_remote_control/adb_commands.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py b/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
index 2cdea47934d2a3e07d4759cf1bd07e09575d35de..984097e837c61c51e7b10098af1296425ab052c1 100644
--- a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
+++ b/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
@@ -120,17 +120,17 @@ class AdbCommands(object):
     return self._adb.IsRootEnabled()
 
 def HasForwarder(adb):
-  return adb.FileExistsOnDevice('/data/local/tmp/forwarder')
+  return adb.FileExistsOnDevice('/data/local/tmp/device_forwarder')
 
 def HowToInstallForwarder():
-  return 'adb push out/$BUILD_TYPE/forwarder %s' % (
-    '/data/local/tmp/forwarder')
+  return 'adb push out/$BUILD_TYPE/device_forwarder %s' % (
+    '/data/local/tmp/device_forwarder')
 
 class Forwarder(object):
   def __init__(self, adb, host_port):
     assert HasForwarder(adb)
 
-    port_pairs = [(host_port, host_port), ]
+    port_pairs = [(0, host_port), ]
     tool = valgrind_tools.BaseTool()
 
     self._host_port = host_port
@@ -152,7 +152,7 @@ class Forwarder(object):
       adb.Adb().PushIfNeeded = FakePush
       self._forwarder = forwarder.Forwarder(
         adb.Adb(), port_pairs,
-        tool, 'localhost', 'unused')
+        tool, '127.0.0.1', os.environ.get('BUILDTYPE', 'Debug'))
     finally:
       adb.Adb().PushIfNeeded = real_push_if_needed
     self._device_port = self._forwarder.DevicePortForHostPort(self._host_port)