am 5c4e1dac: Merge "Update libpng API usage"

* commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976':
  Update libpng API usage