am c1188687: Merge "Don\'t re-export the unwind library."

* commit 'c1188687ae54ab83a94a50efdcde23b7246de997':
  Don't re-export the unwind library.