Merge "Fix Windows SDK build to not use clang."