Merge "Fix log spam in unzip-jar-files" am: 05ecd66557 am: 17f23f3837
am: f161741543

Change-Id: I24ceed9fa2e258a2c1a43bac2d9397862df7cf05