Merge "Switch to shared libpng/libz dependency."