DO NOT MERGE Restore libcorkscrew unwinding.
automerge: 5a69c1d  -s ours

* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
  DO NOT MERGE Restore libcorkscrew unwinding.