Merge "Clean up windows sdk build"