Merge "Revert "libpng: Upgrade to 1.6.26""