[libpng17] Ported cosmetic changes from libpng-1.6.15beta02.