Merge "Fix crash in libunwindstack." am: 8306597e8f am: 95f9407848
am: b7688fa77a

Change-Id: I72ad6731b1bf3d5268e1b41edf07d5e2ae33da48