Merge "Test for ZipFile.finalize."
am: 090795a459

Change-Id: If4a557a9ec534f5a984fb920d1bee1080a16d0ba