Merge "Omit module-info.class when unzipping jar files." am: 5ae6434575 am: 3e55981366
am: da8798f218

Change-Id: Ia4547cfe5ce05ac7d4db99184017202ff54f7d21