tree 5402e4a4ceefc32e6257a26f1c6c608ae9494cc6
parent cebcde3b5a1e406d953629d5b4c87347921a17de
parent bfa719f448ab4d90368a3cdc556e515253528e17
author John Reck <jreck@google.com> 1463696903 +0000
committer android-build-merger <android-build-merger@google.com> 1463696903 +0000

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323  -s ours
am: bfa719f448  -s ours

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

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed