Merge "libziparchive: encode type in fdsan owner tag."
am: 3da42a6c05

Change-Id: Id1446b27dbfaa46ec8bbea9d07247e10d3c0ea97