Merge "zip_archive_test: compare error codes directly."