Merge "Remove a couple of unused inlines from minzip/Zip.h."