Update from https://crrev.com/320343

build/android/pylib/host_driven/test_server.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Host driven test server controller.
 
 This class controls the startup and shutdown of a python driven test server that
 runs in a separate process.
 
 The server starts up automatically when the object is created.
@@ skipping 88 matching lines @@
       python_path = current_python_path + ':' + extra_python_path
     else:
       python_path = extra_python_path
 
     # NOTE: A separate python process is used to simplify getting the right
     # system path for finding includes.
     test_server_flags = test_server_flags or []
     cmd = ['python', os.path.join(src_dir, test_server_path),
            '--log-to-console',
            ('--host=%s' % self.host),
-           ('--port=%d' % self.port)] + test_server_flags
+           ('--port=%d' % self.port),
+           '--on-remote-server'] + test_server_flags
     self._test_server_process = subprocess.Popen(
           cmd, env={'PYTHONPATH': python_path})
     test_url = 'http://%s:%d/%s' % (self.host, self.port,
         TEST_SERVER_CHECK_PARAMS[test_server_path]['url_path'])
     expected_response = TEST_SERVER_CHECK_PARAMS[test_server_path]['response']
     retries = 0
     while retries < 5:
       try:
         d = urllib2.urlopen(test_url).read()
         logging.info('URL %s GOT: %s' % (test_url, d))
         if d.startswith(expected_response):
           break
       except Exception as e:
         logging.info('URL %s GOT: %s' % (test_url, e))
       time.sleep(retries * 0.1)
       retries += 1
 
   def TearDown(self):
     self._test_server_process.kill()
     self._test_server_process.wait()