Merge "Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 am: 0e6bac40c4 am: e26f294187"