Merge "libpng: fix hang during read when inflate fails"