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

Change-Id: Iae24b046178c00e4e8cda7ee1dc25c993ef38c0b