Merge "Ziparchive: Enable -Wconversion" am: 5664489a31
am: e34eab047a

Change-Id: Icb915f69802080319425569b198742727c1929e2