Merge "Make ziparchive-tests run standalone."
am: c8a8771b6b

Change-Id: Ideba391ab6a25aae34eeced8f445ae444a871ecb