Merge remote branch 'cros/upstream' into master.

client/bin/harness.py

Index: client/bin/harness.py
diff --git a/client/bin/harness.py b/client/bin/harness.py
index bcb4f966969734be85975eea2164aef1df3da7fd..6265ca2c543ce30be2ddebad7969ee96cd99b609 100644
--- a/client/bin/harness.py
+++ b/client/bin/harness.py
@@ -82,7 +82,7 @@ class harness(object):
         pass
 
 
-def select(which, job):
+def select(which, job, harness_args):
     if not which:
         which = 'standalone'
 
@@ -91,6 +91,6 @@ def select(which, job):
     harness_name = 'harness_%s' % which
     harness_module = common.setup_modules.import_module(harness_name,
                                                         'autotest_lib.client.bin')
-    harness_instance = getattr(harness_module, harness_name)(job)
+    harness_instance = getattr(harness_module, harness_name)(job, harness_args)
 
     return harness_instance