am: 7c9f2b8a * commit '7c9f2b8a': DO NOT MERGE Cherry pick libpng usage fixes Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a