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 am: a7895725f8 am: 0f59d9b80c
am: 08a4808197

* commit '08a480819763dd632fd8006a0ea57b8220ee121a':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e