Update patches for upstream build-script pull

Author: finagolfin

swift-ci/sdks/android/patches/swift-android-devel.patch

@@ -118,3 +118,20 @@ index f7f2664b2de..01d36e127c6 100644
 
  // CHECK-DISABLED-NOT: normal_count
 
+diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
+index bfb69965890..b5e9f5349c2 100644
+--- a/swift/utils/swift_build_support/swift_build_support/cmake.py
++++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
+@@ -153,10 +153,8 @@ class CMake(object):
+             toolchain_path = product.native_toolchain_path(args.host_target)
+             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
+                                           os.path.join(toolchain_path, 'bin', 'swiftc'))
+-            define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,
+-                                                         'bin', 'clang'))
+-            define("CMAKE_CXX_COMPILER:PATH", os.path.join(toolchain_path,
+-                                                           'bin', 'clang++'))
++            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
++            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
+             define("CMAKE_Swift_COMPILER:PATH", cmake_swiftc_path)
+         else:
+             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER', toolchain.swiftc)

swift-ci/sdks/android/patches/swift-android-trunk-libdispatch.patch

@@ -34,6 +34,24 @@ index e0a3b4465a3..c01af893eda 100644
 
  // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
  // RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect
+diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
+index 9a0f5b43e2d..5c7d1320a2d 100644
+--- a/swift/utils/swift_build_support/swift_build_support/cmake.py
++++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
+@@ -150,11 +150,8 @@ class CMake(object):
+             define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
+ 
+         if self.prefer_native_toolchain and product:
+-            clang_tools_path = product.native_clang_tools_path(args.host_target)
+-            define("CMAKE_C_COMPILER:PATH", os.path.join(clang_tools_path,
+-                                                         'bin', 'clang'))
+-            define("CMAKE_CXX_COMPILER:PATH", os.path.join(clang_tools_path,
+-                                                           'bin', 'clang++'))
++            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
++            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
+ 
+             toolchain_path = product.native_toolchain_path(args.host_target)
+             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
 diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
 index 3da519e..e2dd8ed 100644
 --- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake

swift-ci/sdks/android/patches/swift-android.patch

@@ -34,23 +34,6 @@ index 16e05052609..7ab8cebfab8 100755
 
                    cmake_options=(
                      -DENABLE_SWIFT=YES
-diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
-index bfb69965890..b5e9f5349c2 100644
---- a/swift/utils/swift_build_support/swift_build_support/cmake.py
-+++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
-@@ -153,10 +153,8 @@ class CMake(object):
-             toolchain_path = product.native_toolchain_path(args.host_target)
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
-                                           os.path.join(toolchain_path, 'bin', 'swiftc'))
--            define("CMAKE_C_COMPILER:PATH", os.path.join(toolchain_path,
--                                                         'bin', 'clang'))
--            define("CMAKE_CXX_COMPILER:PATH", os.path.join(toolchain_path,
--                                                           'bin', 'clang++'))
-+            define("CMAKE_C_COMPILER:PATH", toolchain.cc)
-+            define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
-             define("CMAKE_Swift_COMPILER:PATH", cmake_swiftc_path)
-         else:
-             cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER', toolchain.swiftc)
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/product.py b/swift/utils/swift_build_support/swift_build_support/products/product.py
 index 274b6037305..bf0f7fcf671 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/product.py