Merge "Stop exporting private "zutil.h" implementation detail."