Merge pull request #78013 from marcprux/patch-3

Update buildbot_linux_crosscompile_android preset

Author: finagolfin

utils/build-presets.ini

@@ -997,8 +997,6 @@ build-ninja
 android
 android-ndk=%(ndk_path)s
 android-api-level=21
-build-swift-static-stdlib
-build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
 
 # Path to the root of the installation filesystem.
@@ -1011,13 +1009,11 @@ host-test
 
 install-prefix=/usr
 install-llvm
-install-static-linux-config
 install-swift
 install-swiftsyntax
 
 skip-test-linux
 skip-build-benchmarks
-skip-early-swiftsyntax
 
 reconfigure
 
@@ -1026,6 +1022,11 @@ mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build
 
 android-arch=aarch64
 
+[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,x86_64]
+mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build
+
+android-arch=x86_64
+
 # Ubuntu 18.04 preset for backwards compat and future customizations.
 [preset: buildbot_linux_1804]
 mixin-preset=buildbot_linux