Merge remote branch 'cros/upstream' into master

client/bin/autotest

Index: client/bin/autotest
diff --git a/client/bin/autotest b/client/bin/autotest
index 18628817a3285458c6fb193fc5b6e98de4dd3197..e843b7f9a3f28880456db7f2a88663297543cc50 100755
--- a/client/bin/autotest
+++ b/client/bin/autotest
@@ -56,6 +56,11 @@ parser.add_option('--client_test_setup', dest='client_test_setup',
                   type='string', default=None, action='store',
                   help='a comma seperated list of client tests to prebuild on '
                        'the server. Use all to prebuild all of them.')
+
+parser.add_option('--tap', dest='tap_report', action='store_true',
+                  default=None, help='Output TAP (Test anything '
+                  'protocol) reports')
+
 def usage():
     parser.print_help()
     sys.exit(1)