Update swift-android.patch to remove unneeded patches

Author: finagolfin

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

@@ -59,47 +59,6 @@ index 7f290d16..95366592 100644
  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-diff --git a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-index 016bf294..5c42986a 100644
---- a/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-+++ b/swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
-@@ -162,6 +162,10 @@ if(NOT BUILD_SHARED_LIBS)
-         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend _FoundationICU>")
-     target_compile_options(Foundation PRIVATE
-         "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend swiftSynchronization>")
-+    if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
-+      target_compile_options(Foundation PRIVATE
-+          "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -public-autolink-library -Xfrontend android-spawn>")
-+    endif()
- endif()
- 
- set_target_properties(Foundation PROPERTIES
-@@ -174,6 +174,12 @@
-     target_link_libraries(Foundation PUBLIC
-         swiftDispatch)
- endif()
-+  if(${CMAKE_SYSTEM_NAME} STREQUAL Android)
-+    target_link_libraries(Foundation PRIVATE android-spawn)
-+    list(GET CMAKE_FIND_ROOT_PATH 0 SPAWN_DIR)
-+    target_include_directories(Foundation PUBLIC ${SPAWN_DIR}/usr/include)
-+    target_link_directories(Foundation PUBLIC ${SPAWN_DIR}/usr/lib)
-+  endif()
- 
- if(LINKER_SUPPORTS_BUILD_ID)
-   target_link_options(Foundation PRIVATE "LINKER:--build-id=sha1")
-diff --git a/swift-corelibs-foundation/Sources/Foundation/Process.swift b/swift-corelibs-foundation/Sources/Foundation/Process.swift
-index 758dd1df..02970992 100644
---- a/swift-corelibs-foundation/Sources/Foundation/Process.swift
-+++ b/swift-corelibs-foundation/Sources/Foundation/Process.swift
-@@ -944,7 +944,7 @@ open class Process: NSObject, @unchecked Sendable {
-         var spawnAttrs: posix_spawnattr_t = posix_spawnattr_t()
- #endif
-         try _throwIfPosixError(posix_spawnattr_init(&spawnAttrs))
--#if os(Android)
-+#if os(Android)
-         guard var spawnAttrs else {
-             throw NSError(domain: NSPOSIXErrorDomain, code: Int(errno),
-                           userInfo: [NSURLErrorKey:self.executableURL!])
 diff --git a/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake b/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake
 index cbdfc2a..bb4121d 100644
 --- a/swift-foundation/cmake/modules/SwiftFoundationSwiftSupport.cmake
@@ -127,22 +86,6 @@ index 1be9a4b..bd7b1bd 100644
  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-diff --git a/swift-testing/Sources/Testing/CMakeLists.txt b/swift-testing/Sources/Testing/CMakeLists.tx
-index e40cb1b..ff2f920 100644
---- a/swift-testing/Sources/Testing/CMakeLists.txt
-+++ b/swift-testing/Sources/Testing/CMakeLists.txt
-@@ -110,7 +110,10 @@ target_link_libraries(Testing PRIVATE
- if(NOT APPLE)
-   if(NOT CMAKE_SYSTEM_NAME STREQUAL WASI)
-     target_link_libraries(Testing PUBLIC
--      dispatch)
-+      dispatch)
-+    list(GET CMAKE_FIND_ROOT_PATH 0 BT_DIR)
-+    target_include_directories(Testing PUBLIC ${BT_DIR}/usr/include)
-+    target_link_directories(Testing PUBLIC ${BT_DIR}/usr/lib)
-   endif()
-   target_link_libraries(Testing PUBLIC
-     Foundation)
 diff --git a/swift-testing/cmake/modules/TargetTriple.cmake b/swift-testing/cmake/modules/TargetTriple.cmake
 index e087cc4..02f3a95 100644
 --- a/swift-testing/cmake/modules/TargetTriple.cmake