Merge "StrictJarFile: better handle missing files"