Merge "Fix issues in libunwindstack."
am: e05d6afb90

Change-Id: I69d62a4d9fb9810ce13e22d57b84b1cc3d29f05f