Merge "Backtrace: Add libziparchive dependency"
am: 69542edfbe

Change-Id: I4514fe90b92486b2730bc453b8f4badfc9466002