Merge "ZipDirectoryReader: Don't try to parse zero-length files"