Update disabled tests

Author: finagolfin

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

@@ -1,3 +1,15 @@
+diff --git a/swift/test/IRGen/availability_custom_domains_clang.swift b/swift/test/IRGen/availability_custom_domains_clang.swift
+index c0a79478b18..2a94211da21 100644
+--- a/swift/test/IRGen/availability_custom_domains_clang.swift
++++ b/swift/test/IRGen/availability_custom_domains_clang.swift
+@@ -9,6 +9,7 @@
+ // RUN:   -O | %FileCheck %s --check-prefixes=CHECK,CHECK-O
+ 
+ // REQUIRES: swift_feature_CustomAvailability
++// XFAIL: OS=linux-android, OS=linux-androideabi
+ 
+ // CHECK-LABEL: define {{.*}}swiftcc void @"$s4Test24ifAvailableEnabledDomainyyF"()
+ // CHECK: call void @available_in_enabled_domain()
 diff --git a/swift/test/Misc/verify-swift-feature-testing.test-sh b/swift/test/Misc/verify-swift-feature-testing.test-sh
 index 3f36fc979cb..8713ae8fea8 100755
 --- a/swift/test/Misc/verify-swift-feature-testing.test-sh

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

@@ -10,18 +10,6 @@ index 01390761c8c..d84c142397c 100644
 
  // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
  // CHECK-LABEL: test_ascii_scalar_scalar2
-diff --git a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil b/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil
-index 98765e0e4a3..4dc68bf522b 100644
---- a/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil
-+++ b/swift/test/SILOptimizer/semantic-arc-opts-redundantcopyopts.sil
-@@ -1,5 +1,7 @@
- // RUN: %target-sil-opt -module-name Swift -enable-sil-verify-all -semantic-arc-opts -sil-semantic-arc-peepholes-redundant-copyvalue-elim %s | %FileCheck %s
- 
-+// XFAIL: OS=linux-android, OS=linux-androideabi
-+
- // NOTE: Some of our tests here depend on borrow elimination /not/ running!
- // Please do not add it to clean up the IR like we did in
- // semanticarcopts-loadcopy-to-loadborrow!
 diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
 index 16e05052609..7ab8cebfab8 100755
 --- a/swift/utils/build-script-impl