commit 7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865
author John Reck <jreck@google.com> Mon Aug 26 16:53:40 2013 -0700
committer Matt Sarett <msarett@google.com> Tue May 17 20:29:52 2016 +0000
tree bf1025977b9e33d4d76ed716ba0f879884d01e65
parent 60351d3be29977dfe0b422de797a0429edf500b7

DO NOT MERGE Cherry pick libpng usage fixes

------------------------------------------

This is a combination of 2 commits.
The first commit's message is:

Forward compatibility fixes

Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8

-------------------------------------------

This is the 2nd commit message:

libpng usage tweaks

 Bug: 10447005

 Call png_set_interlace_handling explicitly instead of relying on
 implicit handling that logs warnings

 Include filename when printing warnings

Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99

-------------------------------------------
BUG:23265085