Merge "Switch libz to sysv-only hash style"