DO NOT MERGE: Switch to StrictJarFile from ZipFile for archives.
am: 9d7bdbef54  -s ours

Change-Id: Iacc50b3bede1fc2af8655490a23ed14630fe23ad