Merge "Use Unwinder object for unwind tool."
am: 283ca30651

Change-Id: I33b8576799671c8ccc3923eaebfa95cbf6286df4