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

Change-Id: I44836b434fabc250ea95dd7f3e5ce3572863be44