Merge branch 'backport-cxxmodules-export-file-collisions'