Merge "Remove obsolete zlib headers."