diff --git a/test/Driver/Dependencies/only-skip-once.swift b/test/Driver/Dependencies/only-skip-once.swift
index a710f20bfa3eb..f632dbd934505 100644
--- a/test/Driver/Dependencies/only-skip-once.swift
+++ b/test/Driver/Dependencies/only-skip-once.swift
@@ -1,4 +1,4 @@
-// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc
+// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc, OS=linux-android, OS=linux-androideabi
 
 // RUN: %empty-directory(%t)
 // RUN: cp -r %S/Inputs/only-skip-once/* %t
diff --git a/test/Driver/parseable_output.swift b/test/Driver/parseable_output.swift
index fda873a44d5ac..4e3aeaf187693 100644
--- a/test/Driver/parseable_output.swift
+++ b/test/Driver/parseable_output.swift
@@ -1,6 +1,6 @@
 // RUN: %swiftc_driver_plain -emit-executable %s -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
 
-// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu
+// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=linux-android, OS=linux-androideabi
 
 // CHECK: {{[1-9][0-9]*}}
 // CHECK-NEXT: {
diff --git a/test/Driver/parseable_output_unicode.swift b/test/Driver/parseable_output_unicode.swift
index 462fd6318a210..6be687a7670e6 100644
--- a/test/Driver/parseable_output_unicode.swift
+++ b/test/Driver/parseable_output_unicode.swift
@@ -2,7 +2,7 @@
 // RUN: cat "%S/Inputs/unicode.txt" >> %t.rsp
 // RUN: %swiftc_driver_plain -emit-executable @%t.rsp -o %t.out -emit-module -emit-module-path %t.swiftmodule -emit-objc-header-path %t.h -serialize-diagnostics -emit-dependencies -parseable-output -driver-skip-execution 2>&1 | %FileCheck %s
 
-// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu
+// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=linux-android, OS=linux-androideabi
 
 // CHECK: {{[1-9][0-9]*}}
 // CHECK-NEXT: {
diff --git a/test/Driver/sdk-apple.swift b/test/Driver/sdk-apple.swift
index 481ebadcac64b..a9810b60cbe9d 100644
--- a/test/Driver/sdk-apple.swift
+++ b/test/Driver/sdk-apple.swift
@@ -1,4 +1,4 @@
-// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=windows-msvc
+// XFAIL: OS=freebsd, OS=openbsd, OS=linux-gnu, OS=windows-msvc, OS=linux-android, OS=linux-androideabi
 
 // Test SDK detection for immediate mode.
 // RUN: %empty-directory(%t)
diff --git a/test/IDE/print_clang_header_i386.swift b/test/IDE/print_clang_header_i386.swift
index 4a5e6d78ea37a..0418d1753fa54 100644
--- a/test/IDE/print_clang_header_i386.swift
+++ b/test/IDE/print_clang_header_i386.swift
@@ -1,7 +1,6 @@
 // REQUIRES: OS=macosx
 // REQUIRES: CPU=x86_64
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
-// XFAIL: OS=linux-gnu, OS=freebsd
 
 // RUN: echo '#include "header-to-print.h"' > %t.i386.m
 // RUN: %empty-directory(%t)
diff --git a/test/IRGen/abitypes.swift b/test/IRGen/abitypes.swift
index fbb864b9e7452..760c2e1d42a20 100644
--- a/test/IRGen/abitypes.swift
+++ b/test/IRGen/abitypes.swift
@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -I %S/Inputs/abi %s -emit-ir -enable-objc-interop | %FileCheck -check-prefix=%target-cpu-%target-os-abi %s
 
 // FIXME: rdar://problem/19648117 Needs splitting objc parts out
-// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
+// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi
 
 import gadget
 import Foundation
diff --git a/test/Interop/Cxx/foreign-reference/error-in-generic-context.swift b/test/Interop/Cxx/foreign-reference/error-in-generic-context.swift
index d084c2964c41a..36402b63861a4 100644
--- a/test/Interop/Cxx/foreign-reference/error-in-generic-context.swift
+++ b/test/Interop/Cxx/foreign-reference/error-in-generic-context.swift
@@ -1,6 +1,8 @@
 // RUN: rm -rf %t
 // RUN: split-file %s %t
 // RUN: not %target-swift-frontend -emit-ir -I %t/Inputs  %t/test.swift  -enable-experimental-cxx-interop 2>&1 | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 //--- Inputs/module.modulemap
 module Test {
diff --git a/test/Interop/Cxx/foreign-reference/move-only-irgen.swift b/test/Interop/Cxx/foreign-reference/move-only-irgen.swift
index 004daef49de24..a316832aa907d 100644
--- a/test/Interop/Cxx/foreign-reference/move-only-irgen.swift
+++ b/test/Interop/Cxx/foreign-reference/move-only-irgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import MoveOnly
 
diff --git a/test/Interop/Cxx/foreign-reference/move-only-module-interface.swift b/test/Interop/Cxx/foreign-reference/move-only-module-interface.swift
index 82389914336ba..f59149c68795d 100644
--- a/test/Interop/Cxx/foreign-reference/move-only-module-interface.swift
+++ b/test/Interop/Cxx/foreign-reference/move-only-module-interface.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=MoveOnly -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 // CHECK: class MoveOnly {
 // CHECK-NOT: init
diff --git a/test/Interop/Cxx/foreign-reference/move-only-silgen.swift b/test/Interop/Cxx/foreign-reference/move-only-silgen.swift
index 0ee53fa9365eb..616e47b7dfb92 100644
--- a/test/Interop/Cxx/foreign-reference/move-only-silgen.swift
+++ b/test/Interop/Cxx/foreign-reference/move-only-silgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import MoveOnly
 
diff --git a/test/Interop/Cxx/foreign-reference/nullable-module-interface.swift b/test/Interop/Cxx/foreign-reference/nullable-module-interface.swift
index 646ebec51602d..aebd60661db3b 100644
--- a/test/Interop/Cxx/foreign-reference/nullable-module-interface.swift
+++ b/test/Interop/Cxx/foreign-reference/nullable-module-interface.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=Nullable -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 // CHECK: class Empty {
 // CHECK:   func test() -> Int32
diff --git a/test/Interop/Cxx/foreign-reference/pod-irgen.swift b/test/Interop/Cxx/foreign-reference/pod-irgen.swift
index a67e8bb84b6f7..bc4a1f6dfe9b2 100644
--- a/test/Interop/Cxx/foreign-reference/pod-irgen.swift
+++ b/test/Interop/Cxx/foreign-reference/pod-irgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import POD
 
diff --git a/test/Interop/Cxx/foreign-reference/pod-module-interface.swift b/test/Interop/Cxx/foreign-reference/pod-module-interface.swift
index fb90bd53a9d74..22e83941173f6 100644
--- a/test/Interop/Cxx/foreign-reference/pod-module-interface.swift
+++ b/test/Interop/Cxx/foreign-reference/pod-module-interface.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=POD -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 // CHECK: class Empty {
 // CHECK-NOT: init
diff --git a/test/Interop/Cxx/foreign-reference/pod-silgen.swift b/test/Interop/Cxx/foreign-reference/pod-silgen.swift
index 7ed9f1ff12ec0..5255b108a75e6 100644
--- a/test/Interop/Cxx/foreign-reference/pod-silgen.swift
+++ b/test/Interop/Cxx/foreign-reference/pod-silgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import POD
 
diff --git a/test/Interop/Cxx/foreign-reference/singleton-irgen.swift b/test/Interop/Cxx/foreign-reference/singleton-irgen.swift
index 531caf69b29a8..04ee8ec1b2a3c 100644
--- a/test/Interop/Cxx/foreign-reference/singleton-irgen.swift
+++ b/test/Interop/Cxx/foreign-reference/singleton-irgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-experimental-cxx-interop -validate-tbd-against-ir=none -disable-llvm-verify | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import Singleton
 
diff --git a/test/Interop/Cxx/foreign-reference/singleton-module-interface.swift b/test/Interop/Cxx/foreign-reference/singleton-module-interface.swift
index f5bc7a9b63580..d02bf3d6a22ea 100644
--- a/test/Interop/Cxx/foreign-reference/singleton-module-interface.swift
+++ b/test/Interop/Cxx/foreign-reference/singleton-module-interface.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-ide-test -print-module -module-to-print=Singleton -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 // CHECK: class DeletedDtor {
 // CHECK-NOT: init
diff --git a/test/Interop/Cxx/foreign-reference/singleton-silgen.swift b/test/Interop/Cxx/foreign-reference/singleton-silgen.swift
index 6c1cc12d6ad6e..91ee3446bed9c 100644
--- a/test/Interop/Cxx/foreign-reference/singleton-silgen.swift
+++ b/test/Interop/Cxx/foreign-reference/singleton-silgen.swift
@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-silgen %s -I %S/Inputs -enable-experimental-cxx-interop | %FileCheck %s
+//
+// XFAIL: OS=linux-android, OS=linux-androideabi
 
 import Singleton
 
diff --git a/test/Prototypes/CollectionTransformers.swift b/test/Prototypes/CollectionTransformers.swift
index e3a405c78486b..4943ba01d0c57 100644
--- a/test/Prototypes/CollectionTransformers.swift
+++ b/test/Prototypes/CollectionTransformers.swift
@@ -200,7 +200,7 @@ import Darwin
 import Dispatch
 
 // FIXME: port to Linux.
-// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
+// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android
 
 // A wrapper for pthread_t with platform-independent interface.
 public struct _stdlib_pthread_t : Equatable, Hashable {
diff --git a/test/Reflection/box_descriptors.sil b/test/Reflection/box_descriptors.sil
index 641eab38e4178..6c0b23c02b285 100644
--- a/test/Reflection/box_descriptors.sil
+++ b/test/Reflection/box_descriptors.sil
@@ -3,7 +3,7 @@
 // RUN: %target-swift-reflection-dump -binary-filename %t/capture_descriptors%{target-shared-library-suffix} | %FileCheck %s
 
 // SR-10758
-// UNSUPPORTED: OS=linux-gnu
+// UNSUPPORTED: OS=linux-gnu, OS=linux-android, OS=linux-androideabi
 
 // SR-12893
 // XFAIL: OS=openbsd
diff --git a/test/SIL/clang-function-types-android.swift b/test/SIL/clang-function-types-android.swift
index 6268554ece590..1d5d82baff56f 100644
--- a/test/SIL/clang-function-types-android.swift
+++ b/test/SIL/clang-function-types-android.swift
@@ -6,10 +6,10 @@ import ctypes
 
 public func f(g: @convention(c, cType: "void (*)(size_t)") (Int) -> ()) { g(0) }
 
-// CHECK-32: sil @$s4main1f1gyySiXzC9_ZTSPFvjE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> ()) -> () {
-// CHECK-32: bb0(%0 : $@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> ()):
-// CHECK-32:   debug_value %0 : $@convention(c, cType: "void (*)(unsigned int)") @noescape (Int) -> (), let, name "g", argno 1 // id: %1
+// CHECK-32: sil @$s4main1f1gyySiXzC9_ZTSPFvjE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned int)") (Int) -> ()) -> () {
+// CHECK-32: bb0(%0 : $@convention(c, cType: "void (*)(unsigned int)") (Int) -> ()):
+// CHECK-32:   debug_value %0 : $@convention(c, cType: "void (*)(unsigned int)") (Int) -> (), let, name "g", argno 1 // id: %1
 
-// CHECK-64: sil @$s4main1f1gyySiXzC9_ZTSPFvmE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> ()) -> () {
-// CHECK-64: bb0(%0 : $@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> ()):
-// CHECK-64:   debug_value %0 : $@convention(c, cType: "void (*)(unsigned long)") @noescape (Int) -> (), let, name "g", argno 1 // id: %1
+// CHECK-64: sil @$s4main1f1gyySiXzC9_ZTSPFvmE_tF : $@convention(thin) (@convention(c, cType: "void (*)(unsigned long)") (Int) -> ()) -> () {
+// CHECK-64: bb0(%0 : $@convention(c, cType: "void (*)(unsigned long)") (Int) -> ()):
+// CHECK-64:   debug_value %0 : $@convention(c, cType: "void (*)(unsigned long)") (Int) -> (), let, name "g", argno 1 // id: %1
diff --git a/test/SILOptimizer/concat_string_literals.64.swift b/test/SILOptimizer/concat_string_literals.64.swift
index e484231bc8840..cb0593761b56f 100644
--- a/test/SILOptimizer/concat_string_literals.64.swift
+++ b/test/SILOptimizer/concat_string_literals.64.swift
@@ -5,6 +5,10 @@
 // We have a separate test for 32-bit architectures.
 // REQUIRES: PTRSIZE=64
 
+// The string tag was recently shifted to the second byte on Android AArch64,
+// so these tests will need to be adapted for that.
+// XFAIL: OS=linux-android && CPU=aarch64
+
 // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
 // CHECK-LABEL: test_ascii_scalar_scalar2
 // CHECK:  ret { i64, %swift.bridge* } { i64 25185, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
diff --git a/test/Sanitizers/tsan/objc_async.swift b/test/Sanitizers/tsan/objc_async.swift
index 1e5e58696c3ec..97a7dbe15d5a8 100644
--- a/test/Sanitizers/tsan/objc_async.swift
+++ b/test/Sanitizers/tsan/objc_async.swift
@@ -7,8 +7,6 @@
 // REQUIRES: concurrency
 // REQUIRES: objc_interop
 // REQUIRES: tsan_runtime
-// UNSUPPORTED: OS=linux-gnu
-// UNSUPPORTED: OS=windows-msvc
 
 // rdar://76038845
 // UNSUPPORTED: use_os_stdlib
diff --git a/test/lit.cfg b/test/lit.cfg
index 7fb8307946f27..7ff5823d17bea 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -1966,7 +1966,7 @@ def source_compiler_rt_libs(path):
                                         and config.compiler_rt_platform in lib])
 
 compiler_rt_dir = make_path(test_resource_dir, 'clang', 'lib',
-                            platform.system().lower() if not kIsAndroid else 'android')
+                            platform.system().lower())
 source_compiler_rt_libs(compiler_rt_dir)
 
 def check_runtime_libs(features_to_check):
diff --git a/test/stdlib/simd_diagnostics.swift b/test/stdlib/simd_diagnostics.swift
index 03f7ce260f214..f30d278c0cb4f 100644
--- a/test/stdlib/simd_diagnostics.swift
+++ b/test/stdlib/simd_diagnostics.swift
@@ -1,7 +1,7 @@
 // RUN: %target-typecheck-verify-swift
 
 // FIXME: No simd module on linux rdar://problem/20795411
-// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd
+// XFAIL: OS=linux-gnu, OS=windows-msvc, OS=openbsd, OS=linux-android, OS=linux-androideabi
 // XFAIL: OS=wasi
 
 import simd
diff --git a/validation-test/SILOptimizer/large_string_array.swift.gyb b/validation-test/SILOptimizer/large_string_array.swift.gyb
index b86e6201391bb..bc422ca444b6d 100644
--- a/validation-test/SILOptimizer/large_string_array.swift.gyb
+++ b/validation-test/SILOptimizer/large_string_array.swift.gyb
@@ -13,7 +13,7 @@
 
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
 // REQUIRES: long_test
-// REQUIRES: CPU=arm64 || CPU=x86_64
+// REQUIRES: CPU=arm64 || CPU=x86_64 || CPU=aarch64
 
 // Check if the optimizer can optimize the whole array into a statically
 // initialized global
diff --git a/validation-test/stdlib/SIMDParameterPassing.swift.gyb b/validation-test/stdlib/SIMDParameterPassing.swift.gyb
index d2ed07df5ca00..41ed886313b9b 100644
--- a/validation-test/stdlib/SIMDParameterPassing.swift.gyb
+++ b/validation-test/stdlib/SIMDParameterPassing.swift.gyb
@@ -18,7 +18,7 @@
 
 // REQUIRES: executable_test
 // REQUIRES: long_test
-// XFAIL: OS=linux-gnu
+// XFAIL: OS=linux-gnu, OS=linux-android
 
 import StdlibUnittest
 import simd