Merge "Add null checks in ZipFile.finalize."