diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake
index 11fbebe9659c1..21d7699138b9f 100644
--- a/cmake/modules/SwiftConfigureSDK.cmake
+++ b/cmake/modules/SwiftConfigureSDK.cmake
@@ -53,7 +53,7 @@ function(_report_sdk prefix)
     endforeach()
   elseif("${prefix}" STREQUAL "ANDROID")
     if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
-      message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
+      message(STATUS " NDK: ${SWIFT_ANDROID_NDK_PATH}")
     endif()
     if(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
       message(STATUS " Sysroot: ${SWIFT_ANDROID_NATIVE_SYSROOT}")
diff --git a/test/ClangImporter/pcm-emit-direct-cc1-mode.swift b/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
index f5048b9e3d5fd..6bc26ca317722 100644
--- a/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
+++ b/test/ClangImporter/pcm-emit-direct-cc1-mode.swift
@@ -15,5 +15,7 @@
 // CHECK-CLANG-SAME: '-fmodules'
 // CHECK-CLANG-NOT: clang importer driver args
 
+// XFAIL: OS=linux-androideabi
+
 import script
 var _ : ScriptTy
diff --git a/test/IRGen/abitypes_arm.swift b/test/IRGen/abitypes_arm.swift
index 9428294483d9c..52bd8b101457d 100644
--- a/test/IRGen/abitypes_arm.swift
+++ b/test/IRGen/abitypes_arm.swift
@@ -11,6 +11,6 @@ class Foo {
   }
 }
 
-// armv7: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
+// armv7: define internal void @makeOne(ptr{{( dead_on_unwind)?}} noalias{{( writable)?}} sret({{.*}}) align 4 %agg.result, float{{( noundef)?}} %f, float{{( noundef)?}} %s)
 // armv7s: define internal void @makeOne(ptr noalias sret({{.*}}) align 4 %agg.result, float %f, float %s)
 // armv7k: define internal %struct.One @makeOne(float {{.*}}%f, float {{.*}}%s)
diff --git a/test/Interop/Cxx/class/constructors-copy-module-interface.swift b/test/Interop/Cxx/class/constructors-copy-module-interface.swift
index 042c10e7d1d9b..254f6543b58af 100644
--- a/test/Interop/Cxx/class/constructors-copy-module-interface.swift
+++ b/test/Interop/Cxx/class/constructors-copy-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+// XFAIL: OS=linux-androideabi
 
 // CHECK: struct TemplatedCopyConstructor
 // CHECK: struct TemplatedCopyConstructorWithExtraArg
diff --git a/test/Interop/Cxx/class/constructors-diagnostics.swift b/test/Interop/Cxx/class/constructors-diagnostics.swift
index aac0148066037..8fa99fae7fb12 100644
--- a/test/Interop/Cxx/class/constructors-diagnostics.swift
+++ b/test/Interop/Cxx/class/constructors-diagnostics.swift
@@ -2,6 +2,7 @@
 
 // This test uses -verify-additional-file, which do not work well on Windows.
 // UNSUPPORTED: OS=windows-msvc
+// XFAIL: OS=linux-androideabi
 
 import Constructors
 
diff --git a/test/Interop/Cxx/class/constructors-module-interface.swift b/test/Interop/Cxx/class/constructors-module-interface.swift
index bf189b6e3024b..d2c3d65f03e68 100644
--- a/test/Interop/Cxx/class/constructors-module-interface.swift
+++ b/test/Interop/Cxx/class/constructors-module-interface.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=Constructors -I %S/Inputs/ -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+// XFAIL: OS=linux-androideabi
 
 // CHECK:      struct ExplicitDefaultConstructor {
 // CHECK-NEXT:   init()
diff --git a/test/Interop/Cxx/class/constructors-silgen.swift b/test/Interop/Cxx/class/constructors-silgen.swift
index b1624ccccfe52..79cbdf170de9c 100644
--- a/test/Interop/Cxx/class/constructors-silgen.swift
+++ b/test/Interop/Cxx/class/constructors-silgen.swift
@@ -1,4 +1,5 @@
 // RUN: %target-swiftxx-frontend -I %S/Inputs -Xllvm -sil-print-types -emit-silgen %s | %FileCheck %s
+// XFAIL: OS=linux-androideabi
 
 import Constructors
 
diff --git a/test/Interop/Cxx/class/constructors-typechecker.swift b/test/Interop/Cxx/class/constructors-typechecker.swift
index 8ce10b1ca752a..52ff4104b83fe 100644
--- a/test/Interop/Cxx/class/constructors-typechecker.swift
+++ b/test/Interop/Cxx/class/constructors-typechecker.swift
@@ -1,4 +1,5 @@
 // RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-experimental-cxx-interop
+// XFAIL: OS=linux-androideabi
 
 import Constructors
 
diff --git a/test/Interop/Cxx/class/custom-new-operator-irgen.swift b/test/Interop/Cxx/class/custom-new-operator-irgen.swift
index 74e692c9db20a..0423493afac1a 100644
--- a/test/Interop/Cxx/class/custom-new-operator-irgen.swift
+++ b/test/Interop/Cxx/class/custom-new-operator-irgen.swift
@@ -5,4 +5,4 @@ import CustomNewOperator
 var x = callsCustomNew()
 
 // Make sure the definition of `operator new` is emitted.
-// CHECK: define {{.*}} @{{_ZnwmPv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}
+// CHECK: define {{.*}} @{{_Znw(j|m)Pv15container_new_t|"\?\?2@YAPEAX_KPEAXUcontainer_new_t@@@Z"}}
diff --git a/test/SILOptimizer/package-cmo-serialize-tables.swift b/test/SILOptimizer/package-cmo-serialize-tables.swift
index 382ff2e808055..f061374b2a128 100644
--- a/test/SILOptimizer/package-cmo-serialize-tables.swift
+++ b/test/SILOptimizer/package-cmo-serialize-tables.swift
@@ -19,7 +19,7 @@
 
 // Temporarily disabling on watchOS (both arm64_32 & armv7k):
 // rdar://140330692 (🟠 OSS Swift CI: oss-swift_tools-RA_stdlib-DA_test-device-non_executable failed...
-// UNSUPPORTED: OS=watchos
+// UNSUPPORTED: OS=watchos, OS=linux-androideabi
 
 //--- main.swift
 
diff --git a/test/SILOptimizer/throws_prediction.swift b/test/SILOptimizer/throws_prediction.swift
index f7f2664b2de3d..01d36e127c67f 100644
--- a/test/SILOptimizer/throws_prediction.swift
+++ b/test/SILOptimizer/throws_prediction.swift
@@ -16,7 +16,7 @@
 // RUN:   -sil-verify-all -module-name=test -emit-sil \
 // RUN:       | %FileCheck --check-prefix CHECK-DISABLED %s
 
-// UNSUPPORTED: CPU=armv7k || CPU=arm64_32
+// UNSUPPORTED: CPU=armv7k, CPU=arm64_32, CPU=armv7
 
 // CHECK-DISABLED-NOT: normal_count
 
diff --git a/utils/build-script-impl b/utils/build-script-impl
index 6e538161f83c4..2879dd2df13a1 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -841,6 +841,12 @@ function set_build_options_for_host() {
     # and it must be the same for both LLVM and Swift
 
     if [[ "${SWIFT_HOST_TRIPLE}" ]] ; then
+        # Adding this until we can configure these corelibs repos with a CMake
+        # toolchain file
+        SWIFT_TARGET_CMAKE_OPTIONS+=(
+            -DCMAKE_Swift_COMPILER_TARGET:STRING="${SWIFT_HOST_TRIPLE}"
+        )
+
         llvm_cmake_options+=(
             -DLLVM_HOST_TRIPLE:STRING="${SWIFT_HOST_TRIPLE}"
         )
diff --git a/utils/swift_build_support/swift_build_support/products/curl.py b/utils/swift_build_support/swift_build_support/products/curl.py
index 5025f5c8bcdf6..d8c2f32dd8dff 100644
--- a/utils/swift_build_support/swift_build_support/products/curl.py
+++ b/utils/swift_build_support/swift_build_support/products/curl.py
@@ -114,8 +114,8 @@ def build(self, host_target):
         self.cmake_options.define('ENABLE_UNIX_SOCKETS', 'NO')
         self.cmake_options.define('ENABLE_THREADED_RESOLVER', 'NO')
         self.cmake_options.define('USE_ECH', 'NO')
-        self.cmake_options.deifne('USE_HTTPSRR', 'NO')
-        self.cmake_options.deifne('USE_OPENSSL_QUIC', 'NO')
+        self.cmake_options.define('USE_HTTPSRR', 'NO')
+        self.cmake_options.define('USE_OPENSSL_QUIC', 'NO')
 
         self.generate_toolchain_file_for_darwin_or_linux(host_target)
 
@@ -123,4 +123,4 @@ def build(self, host_target):
             # If we're building zlib, make cmake search in the built toolchain
             toolchain_path = self.host_install_destdir(host_target)
             self.cmake_options.define('CMAKE_FIND_ROOT_PATH', toolchain_path)
-        self.build_with_cmake(['libcurl'], self.args.curl_build_variant, [])
+        self.build_with_cmake(['libcurl_static'], self.args.curl_build_variant, [])
diff --git a/utils/swift_build_support/swift_build_support/products/product.py b/utils/swift_build_support/swift_build_support/products/product.py
index 8e675f228a29f..47e7ab79905a3 100644
--- a/utils/swift_build_support/swift_build_support/products/product.py
+++ b/utils/swift_build_support/swift_build_support/products/product.py
@@ -212,7 +212,7 @@ def install_toolchain_path(self, host_target):
         if self.args.cross_compile_hosts:
             if self.is_darwin_host(host_target):
                 install_destdir = self.host_install_destdir(host_target)
-            else:
+            elif self.args.cross_compile_append_host_target_to_destdir:
                 install_destdir = os.path.join(install_destdir, self.args.host_target)
         return targets.toolchain_path(install_destdir,
                                       self.args.install_prefix)