Revert 237667 "[Telemetry] Refactor common Android test harness ..."

Revert 237667 "[Telemetry] Refactor common Android test harness ..."

http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28amd64%29/builds/12649/steps/BuildPackages/logs/stdio

autotest-chrome-0.0.1-r3242: ERROR:root:bluetooth_RegressionClient import error: No module named telemetry.core.  Skipping bluetooth_RegressionClient
autotest-chrome-0.0.1-r3242: Traceback (most recent call last):
autotest-chrome-0.0.1-r3242:   File "/build/amd64-generic/tmp/portage/chromeos-base/autotest-chrome-0.0.1-r3242/work/autotest-work/client/bin/setup_job.py", line 72, in init_test
autotest-chrome-0.0.1-r3242:     exec import_stmt + '\n' + init_stmt in locals_dict, globals_dict
autotest-chrome-0.0.1-r3242:   File "<string>", line 1, in <module>
autotest-chrome-0.0.1-r3242:   File "/build/amd64-generic/tmp/portage/chromeos-base/autotest-chrome-0.0.1-r3242/work/autotest-work/client/site_tests/bluetooth_RegressionClient/bluetooth_RegressionClient.py", line 7, in <module>
autotest-chrome-0.0.1-r3242:     from autotest_lib.client.cros.bluetooth import bluetooth_semiauto_helper
autotest-chrome-0.0.1-r3242:   File "/build/amd64-generic/tmp/portage/chromeos-base/autotest-chrome-0.0.1-r3242/work/autotest-work/client/cros/bluetooth/bluetooth_semiauto_helper.py", line 10, in <module>
autotest-chrome-0.0.1-r3242:     from autotest_lib.client.cros import semiauto_framework
autotest-chrome-0.0.1-r3242:   File "/build/amd64-generic/tmp/portage/chromeos-base/autotest-chrome-0.0.1-r3242/work/autotest-work/client/cros/semiauto_framework.py", line 9, in <module>
autotest-chrome-0.0.1-r3242:     from autotest_lib.client.common_lib.cros import chrome
autotest-chrome-0.0.1-r3242:   File "/build/amd64-generic/tmp/portage/chromeos-base/autotest-chrome-0.0.1-r3242/work/autotest-work/client/common_lib/cros/chrome.py", line 7, in <module>
autotest-chrome-0.0.1-r3242:     from telemetry.core import browser_finder, browser_options, exceptions
autotest-chrome-0.0.1-r3242: ImportError: No module named telemetry.core

> [Telemetry] Refactor common Android test harness functions.
> 
> Refactoring common cleanup code required by both
> android_browser_finder.py and perf/setup.py and moving it into
> pyblib/utils/test_environment.py.
> Also, this change avoids killing twice the adb server when running
> in a bot environment, where the adb restart is already invoked by
> the bot steps.
> 
> BUG=268450
> R=bulach@chromium.org,tonyg@chromium.org
> NOTRY=true
> 
> Review URL: https://codereview.chromium.org/62953024

TBR=primiano@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=237674

[Nico, 2013-11-28 05:15:39]

Committed patchset #1 manually as r237674.