[libpng17] Finished merging with libpng16 (pngrutil.c and pnglibconf.dfa)