am 66e31dc5: am 3a088524: Merge "Rewrite unwind thread handling."

* commit '66e31dc51e0d8db595cc1514527c4db6f5cdeba7':
  Rewrite unwind thread handling.