Merge "Track libziparchive API change."
am: 32581e1dd2

Change-Id: I498a0197bb6aab88217a4c796fd5bed7c1802e33