Merge "Update libpng API usage"