Merge "Fix crash in libunwindstack."
am: 8306597e8f

Change-Id: Iead0e058dd15d70ac9ccc58794119283df41c419