Merge pull request #266 from emscripten-core/clang_cl

Cherry-pick upstream r357714