The upstream zlib package was recently reorganized in a way that
caused our git fetch test to fail. Update it to match.

(cherry picked from commit 2ad9d63c)