libpng: include ../zlib/zlib.h -- from c4e5e9b0
libpng: pnglibconf set to match closer to the one used for 1.5.x -- from c961c0ae