Still Fixing libpng

Change-Id: I43e1e16455e41212c6125725d7e51078d9f935bc