Merge "Add java.util.zip.ZipException to preloads for test 912-classes."
am: 3993358fab

Change-Id: Ie97b51bb5f5c774e8dee90657a1a42bb2b0a8858