am f6bc28f0: am 38246b3b: Merge "Don\'t discard directory entries in jar files."

* commit 'f6bc28f002e7a43d92b1955c82fd8a030cfcb182':
  Don't discard directory entries in jar files.