Merge branch 'backport-3.28-cxxmodules-no-export-basedirs-as-include-paths'