Merge "Update for LocalUnwinder object removal." am: 25de3ac3f1

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2007331

Change-Id: I34b0502a05780af5b5d1068408de6c29e032e4eb