Merge "Update for libunwindstack changes." am: f1ce5ed2a9 am: e162881e04

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1878056

Change-Id: If67a231a882e3b710e4c882860715cee4abaa86f