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

Change-Id: I5542f72cd0dc876b9162569d519e323fc1bd93b3