Merge "Update windows sdk build instructions"