Pull libpng in tree to avoid the configuration issue related to libpng.

Most work done by @pliu6

Supercedes #737