Merge remote branch 'cros/upstream' into master

frontend/tko/common.py

Index: frontend/tko/common.py
diff --git a/frontend/tko/common.py b/frontend/tko/common.py
index d37136e8368d678c883c8efaf1eb78dbf064f918..1edf302fa57e150503c8a3803f5485b35296e542 100644
--- a/frontend/tko/common.py
+++ b/frontend/tko/common.py
@@ -6,19 +6,3 @@ sys.path.insert(0, client_dir)
 import setup_modules
 sys.path.pop(0)
 setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
-import os, sys
-dirname = os.path.dirname(sys.modules[__name__].__file__)
-autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..'))
-client_dir = os.path.join(autotest_dir, "client")
-sys.path.insert(0, client_dir)
-import setup_modules
-sys.path.pop(0)
-setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")
-import os, sys
-dirname = os.path.dirname(sys.modules[__name__].__file__)
-autotest_dir = os.path.abspath(os.path.join(dirname, '..', '..'))
-client_dir = os.path.join(autotest_dir, "client")
-sys.path.insert(0, client_dir)
-import setup_modules
-sys.path.pop(0)
-setup_modules.setup(base_path=autotest_dir, root_module_name="autotest_lib")