Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

test/lit.cfg

@@ -944,6 +944,12 @@ elif run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'wi
         (config.variant_triple, clang_mcp_opt))
     config.target_ld = "ld -L%r" % (make_path(test_resource_dir, config.target_sdk_name))
 elif run_os == 'linux-androideabi' or run_os == 'linux-android':
+    # The module triple for Android ARMv7 seems to be canonicalized in LLVM
+    # to be armv7-none-linux-android, without the "eabi" bit. Let's remove the
+    # same bit from the substitutions so the tests pass correctly.
+    target_specific_module_triple = re.sub(r'androideabi', 'android',
+                                           target_specific_module_triple)
+    config.variant_triple = re.sub(r'androideabi', 'android', config.variant_triple)
     def get_architecture_value(**kwargs):
         result = kwargs[run_cpu]
         if result is None: