Merge "libziparchive: encode type in fdsan owner tag."