[build-script] Push build-swift-stdlib-unittest-extra one level down

This will allow us to disable building StdlibUnittest for
specific presets.

Author: ahoppen

utils/build-presets.ini

@@ -298,9 +298,6 @@ reconfigure
 verbose-build
 build-ninja
 
-build-swift-stdlib-unittest-extra
-
-
 [preset: buildbot_incremental_base_all_platforms]
 mixin-preset=buildbot_incremental_base
 
@@ -321,6 +318,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+build-swift-stdlib-unittest-extra
+
 libcxx
 
 # Build llbuild & swiftpm here
@@ -381,6 +380,8 @@ mixin-preset=buildbot_incremental_base
 # of the XCTest Xcode project.
 xctest
 
+build-swift-stdlib-unittest-extra
+
 dash-dash
 
 # This preset is meant to test XCTest, not Swift or Foundation. We don't
@@ -416,6 +417,8 @@ build-subdir=buildbot_incremental_asan
 release-debuginfo
 assertions
 
+build-swift-stdlib-unittest-extra
+
 dash-dash
 
 # FIXME: Swift/ASan does not support iOS yet.
@@ -442,6 +445,8 @@ release-debuginfo
 assertions
 enable-tsan
 
+build-swift-stdlib-unittest-extra
+
 dash-dash
 
 skip-build-ios
@@ -460,6 +465,8 @@ build-subdir=buildbot_incremental_asan_ubsan
 release-debuginfo
 assertions
 
+build-swift-stdlib-unittest-extra
+
 dash-dash
 
 # FIXME: Swift/UBSan does not support mac os x yet.
@@ -489,6 +496,8 @@ build-subdir=buildbot_incremental_asan_debug
 # Build Release with debug info, so that we can symbolicate backtraces.
 assertions
 
+build-swift-stdlib-unittest-extra
+
 dash-dash
 
 # FIXME: Swift/ASan does not support iOS yet.
@@ -519,6 +528,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+build-swift-stdlib-unittest-extra
+
 # We run the OS X tests and validation tests.
 test
 validation-test
@@ -1353,6 +1364,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+build-swift-stdlib-unittest-extra
+
 libcxx
 
 # Build llbuild & swiftpm here
@@ -1396,6 +1409,8 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+build-swift-stdlib-unittest-extra
+
 # Build llbuild & swiftpm here
 llbuild
 swiftpm
@@ -1415,6 +1430,8 @@ skip-test-osx
 mixin-preset=buildbot_incremental_base
 build-subdir=buildbot_incremental
 
+build-swift-stdlib-unittest-extra
+
 libcxx
 llbuild
 swiftpm