Merge "libstagefright: track libziparchive API change."