Merge "Add vendor_available:true to libpng"