Revert of [Android] Add ChromiumNetTestSupport.apk for the java 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 devil.android import device_errors
 from pylib import flag_changer
@@ skipping 119 matching lines @@
     display_name = self._GetTestName(test)
     flags = test['flags']
     if flags.add:
       display_name = '%s with {%s}' % (display_name, ' '.join(flags.add))
     if flags.remove:
       display_name = '%s without {%s}' % (display_name, ' '.join(flags.remove))
     return display_name
 
   #override
   def _RunTest(self, device, test):
-    extras = {}
+    extras = self._test_instance.GetHttpServerEnvironmentVars()
 
     flags = None
     test_timeout_scale = None
     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)
@@ skipping 90 matching lines @@
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout