Merge "Fix crashing StrictJarFile due to doubled closing." am: 68ea36243d
am: 15cd392108

Change-Id: I63034776a185682f11ea736b0d37a4b3be31bc47