Merge pull request #74603 from hyp/eng/android-link-cxxstdlib

[cxx-interop][android] link with CxxStdlib when building for Android too

Author: hyp

lib/AST/ModuleDependencies.cpp

@@ -537,19 +537,14 @@ swift::dependencies::registerCxxInteropLibraries(
                     })) {
     // Only link with CxxStdlib on platforms where the overlay is available.
     switch (Target.getOS()) {
-    case llvm::Triple::Linux:
-      if (!Target.isAndroid())
-        RegistrationCallback(LinkLibrary("swiftCxxStdlib",
-                                         LibraryKind::Library));
-      break;
     case llvm::Triple::Win32: {
       RegistrationCallback(
           LinkLibrary(hasStaticCxxStdlib ? "libswiftCxxStdlib" : "swiftCxxStdlib",
                       LibraryKind::Library));
       break;
     }
     default:
-      if (Target.isOSDarwin())
+      if (Target.isOSDarwin() || Target.isOSLinux())
         RegistrationCallback(LinkLibrary("swiftCxxStdlib",
                                          LibraryKind::Library));
       break;