Merge "Revert "Fix Windows SDK build.""