Merge "simpleperf: track libziparchive API change."