Merge "Remove zip --symlinks"