[libpng16] Catch up with some recent changes that did not get merged.
4 files changed