DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
am: 5527fd1323 -s ours
* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
This commit is contained in: