Merge "Fix Windows SDK build."