Merge "Fix unwind information for crash assembler." am: e6453c54

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2485457



Change-Id: Ib632c471cee8b10ac8f81830406d9d86033e116e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>