Merge "libpng: fix hang during read when inflate fails"
am: 0d1ef6789f  -s ours

* commit '0d1ef6789fec2438560d9e0a0d0c8b3455db3fb2':
  libpng: fix hang during read when inflate fails