am: 839b4e59 * commit '839b4e59': DO NOT MERGE Use updated libpng API Change-Id: I7bbece70a4129554d953fd22c71527b2ca11262e