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

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