Merge "Merge "Allow libunwindstack to use libz_static." into main am: e39eef61 am: caa2e3ae am: f0be4319" into main
mentioned in commit 2e249c7e