Rebase after swiftlang#419

Author: mhegazy

platforms/Windows/bld/asserts/bld.asserts.wixproj

@@ -39,7 +39,7 @@
     <!-- FIXME(#81557) this needs to be properly staged once the sanitizers are included -->
     <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
       <ComponentGroupName>SwiftStaticClangResources_asserts</ComponentGroupName>
-      <DirectoryRefId>_usr_lib_swift_static_clang</DirectoryRefId>
+      <DirectoryRefId>toolchain_asserts_usr_lib_swift_static_clang</DirectoryRefId>
       <PreprocessorVariable>var._USR_LIB_SWIFT_STATIC_CLANG</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>

platforms/Windows/shared/shared.wxs

@@ -47,8 +47,8 @@
                 <Directory Id="toolchain_asserts_usr_lib_swift" Name="swift">
                   <Directory Id="toolchain_asserts_usr_lib_swift_clang" Name="clang" />
                 </Directory>
-                <Directory Id="_usr_lib_swift_static" Name="swift_static">
-                  <Directory Id="_usr_lib_swift_static_clang" Name="clang" />
+                <Directory Id="toolchain_asserts_usr_lib_swift_static" Name="swift_static">
+                  <Directory Id="toolchain_asserts_usr_lib_swift_static_clang" Name="clang" />
                 </Directory>
               </Directory>
               <Directory Id="toolchain_asserts_usr_share" Name="share">