Merge "Mark libziparchive as double_loadable"
am: a7112f4c9b

Change-Id: Ib2d8fd8e511e67cc6ff0eea3f99bc72c7ba4a940