am: bfa719f4 -s ours * commit 'bfa719f4': DO NOT MERGE Cherry pick libpng usage fixes Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed