Merge "Continue using the legacy zlib headers."