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

Change-Id: Iff75e670d4311eecaa1f3780adaf23725420cb31