Merge "Fix windows sdk build."