Fix extra and comment ordering in ZipEntry reading

(cherry picked from commit c242577b1569f97f806ef176e4549141df147b78)

Bug: 10424836
Change-Id: I99e6722ef898baa7f9a2d56e84e88aae5a6c9f4a
2 files changed