Fixes #6813. As a side effect, this also brings in xxhash 0.7.4. (matches commit 66c2b4c8bf)
66c2b4c8bf