Merge "Reduce libziparchive internal hashtable memory size"
am: 50947c1b29

Change-Id: Ibae91c43ca36d1f5a6b45202b6d5759092fa4d25