Merge "Allow sdk/builders to be built using Windows SDK."