Merge "Fix make_windows_sdk."