Merge "simpleperf: track libziparchive API change."
am: c181f79e8c

Change-Id: Iaa91edcda87e44106466e26cb1a8c58558c72b8a