Merge "Fix issues in libunwindstack."