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

Change-Id: I40c0c1387c2492c8ce4eec2623f25b2f041c13ec