Use correct branches for xz.
Merge pull request #718 from ktf/calloc-in-xz

Calloc in xz