Merge "Fix issues in libunwindstack." am: e05d6afb90
am: 31bf08431c

Change-Id: Ieca0fc29f7004d2324011e646f2e42d7ebeafe5e