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

Change-Id: I09cc79bf542dd14365544ef091118ad61c758cf4