Merge branch 'backport-cxxmodules-ninja-1.11' into cxxmodules-ninja-1.11