Merge "Fix compilation on windows and clang-cl+ninja."