tree 87db8770056962a7c6a0d71823a0d69aa12dcab1
parent 6d5f80d13b06d439db08fcd5d25490edb322f923
parent a7895725f8858465a404cbe4f6d5091e39423529
author John Reck <jreck@google.com> 1463698025 +0000
committer android-build-merger <android-build-merger@google.com> 1463698025 +0000

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

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

Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63