Merge "Bionic: Add ziparchive test dependency"