Merge "Update libpng 1.6.22beta" into nyc-dev