Fix extra and comment ordering in ZipEntry reading

Change-Id: I99e6722ef898baa7f9a2d56e84e88aae5a6c9f4a