Merge pull request #3994 from apple/fix-SR-2232-swift-3.0-branch

[Preset] SR-2232 Update preset to use build-swift-static-sdk-overlay

Author: shahmishal

utils/build-presets.ini

@@ -36,6 +36,7 @@ build-ninja
 # Build static standard library because it is used
 # to build external projects.
 build-swift-static-stdlib
+build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
 
 compiler-vendor=apple
@@ -188,6 +189,7 @@ lto
 dash-dash
 
 build-swift-static-stdlib
+build-swift-static-sdk-overlay
 
 # Don't run host tests for iOS, tvOS and watchOS platforms to make the build
 # faster.
@@ -620,6 +622,7 @@ install-xctest
 install-prefix=/usr
 swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license
 build-swift-static-stdlib
+build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
 
 # Executes the lit tests for the installable package that is created
@@ -683,6 +686,8 @@ install-xctest
 install-prefix=/usr
 swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;dev
 build-swift-static-stdlib
+build-swift-static-sdk-overlay
+
 skip-test-lldb
 
 # Executes the lit tests for the installable package that is created
@@ -766,6 +771,7 @@ lldb-build-type=Release
 verbose-build
 build-ninja
 build-swift-static-stdlib
+build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
 compiler-vendor=apple
 playgroundlogger-build-type=Release