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

Change-Id: If3f0a51c3c19b0825bb532758990961c94b2b061