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

Change-Id: If74950c2966a21251cc65d624226077e77ef2ff5