Merge "StrictJarFileTest: Make sure zero length files are handled correctly"