Merge "Mark libziparchive as double_loadable"