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

Change-Id: I05d9ff3a90e9dfd248a68b3065281609134d66b3