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

Change-Id: Ibff1f3b34993391cd62c9c9f1d90adb62b4e70a8