Merge pull request #65259 from apple/egorzhdan/cxxstdlib-armv7k

[cxx-interop] Enable CxxShim headers for armv7k watchOS

Author: egorzhdan

stdlib/public/Cxx/cxxshim/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(libcxxshim_modulemap_target_list)
 foreach(sdk ${SWIFT_SDKS})
-  foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
+  foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES} ${SWIFT_SDK_${sdk}_MODULE_ARCHITECTURES})
     set(arch_suffix "${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
     set(arch_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}")