[Android] Begin switching from lighttpd + apache to EmbeddedTestServer.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 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.
 
 import logging
 import re
 import time
 
 from pylib import flag_changer
 from pylib.base import base_test_result
@@ skipping 112 matching lines @@
   #override
   def _GetTests(self):
     return self._test_instance.GetTests()
 
   #override
   def _GetTestName(self, test):
     return '%s#%s' % (test['class'], test['method'])
 
   #override
   def _RunTest(self, device, test):
-    extras = self._test_instance.GetHttpServerEnvironmentVars()
+    extras = {}
 
     if isinstance(test, list):
       if not self._test_instance.driver_apk:
         raise Exception('driver_apk does not exist. '
                         'Please build it and try again.')
 
       def name_and_timeout(t):
         n = self._GetTestName(t)
         i = self._GetTimeoutFromAnnotations(t['annotations'], n)
         return (n, i)
@@ skipping 54 matching lines @@
 
     try:
       scale = int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       scale = 1
     timeout *= scale
 
     return timeout