Merge "Preserve symlinks for non-Windows."