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

Change-Id: I30700c24c900ef7cef3f24ab0eda911e7b86c91c