am: 5527fd13 -s ours * commit '5527fd13': DO NOT MERGE Cherry pick libpng usage fixes Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd