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