am 99aaedc2: Merge "Fix extra and comment ordering in ZipEntry reading"

* commit '99aaedc26d15bff0760ecb44e5e80d399f5cd691':
  Fix extra and comment ordering in ZipEntry reading