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

Change-Id: I66b231fac078d1bea4bdfc10508134992a85d212