am: 1b1fcbaa * commit '1b1fcbaa': DO NOT MERGE Cherry pick libpng usage fixes Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315