Remove our local patches, upstream has started installing zipconf.h into an architecture-independent directory.