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

Change-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596