Commits
John Reck authored and android-build-merger committed a7895725f88M
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d am: 1da8c9baa2 am: 8238207ce6 -s ours * commit '8238207ce6268422bcdb50d44f03e6a220081294': DO NOT MERGE Cherry pick libpng usage fixes Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
Showing diff to82b9565bd13