Move zlib to Makefile.common too