Merge "zip_archive_test: compare error codes directly." am: d1e9e7bc06
am: 9be5dbed91

Change-Id: I42d449eba683e2f2b158992573cacbbde2b28e27