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
am: 7298186769  -s ours

* commit '7298186769395978045ed2d35252cdf7f644d85b':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735