Merge "Upgrade libpng to v1.6.40"