Merge "Update windows sdk to build non-recursively"