Merge branch 'master' of github.com:dart-lang/sdk into update-status-file

tests/standalone/standalone.status

Index: tests/standalone/standalone.status
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index 687f37cf5d6d10762ce0e9be8d02304c7c22c162..7cd6257a87edaec1b7e0454d4441c50ef6a0cd9a 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -44,8 +44,8 @@ io/directory_fuzz_test: Skip
 # This is expected as MacOS by default runs with a very low number
 # of allowed open files ('ulimit -n' says something like 256).
 io/socket_many_connections_test: Skip
-# Client certs and/or PKCS12 certs working locally but not on buildbot.
-io/secure_server_client_certificate_test: Pass, Fail
+# Re-enable once the bots have been updated. Issue #26057
+io/secure_server_client_certificate_test: Skip
 
 [ $runtime == vm && $system == linux ]
 # These tests have started timing out and issue 25649 has been filed to