am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""

* commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6':
  Revert "Revert enabling libunwind."