Remove or move upstreamed patches

Author: finagolfin

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

@@ -135,3 +135,16 @@ index bfb69965890..b5e9f5349c2 100644
              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
++++ b/swift/utils/swift_build_support/swift_build_support/products/product.py
+@@ -212,7 +212,7 @@ class Product(object):
+         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)

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

@@ -10,30 +10,6 @@ index 3f36fc979cb..8713ae8fea8 100755
              "grep",
              "--extended-regexp",
              "--recursive",
-diff --git a/swift/test/Reflection/conformance_descriptors.swift b/swift/test/Reflection/conformance_descriptors.swift
-index b114f764552..e1bd98c08f4 100644
---- a/swift/test/Reflection/conformance_descriptors.swift
-+++ b/swift/test/Reflection/conformance_descriptors.swift
-@@ -5,6 +5,7 @@
- //
- // Temporarily disable on AArch64 Linux (rdar://88451721)
- // UNSUPPORTED: OS=linux-gnu && CPU=aarch64
-+// XFAIL: OS=linux-android
- 
- // rdar://100558042
- // UNSUPPORTED: CPU=arm64e
-diff --git a/swift/test/Reflection/typeref_decoding.swift b/swift/test/Reflection/typeref_decoding.swift
-index e0a3b4465a3..c01af893eda 100644
---- a/swift/test/Reflection/typeref_decoding.swift
-+++ b/swift/test/Reflection/typeref_decoding.swift
-@@ -10,6 +10,7 @@
- 
- // FIXME: rdar://127796117
- // UNSUPPORTED: OS=linux-gnu && CPU=aarch64
-+// XFAIL: OS=linux-android
- 
- // 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

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

@@ -34,19 +34,6 @@ index 16e05052609..7ab8cebfab8 100755
 
                    cmake_options=(
                      -DENABLE_SWIFT=YES
-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
-+++ b/swift/utils/swift_build_support/swift_build_support/products/product.py
-@@ -212,7 +212,7 @@ class Product(object):
-         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)
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py b/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py
 index 324d1a77eea..e88601a8701 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/swift_testing.py