Summary: These changes create a preference for the newer 6.1 SDK on Windows.
Reviewed-by: tbell

Reviewed-by: tbell