Not sure why the code has now started to require that, even if have
used the same bundled libpng as for a long time.

Change-Id: I2da223bc46c24563ce9d170643c28cc5c93f7d56