Merge "libpng: Upgrade to 1.6.25"