Merge "Fix the win_sdk build."