Merge "Do not try non-dwarf local unwinds for x86."
am: 5ee3219b02

* commit '5ee3219b02b84c43e84ded15b5cf6a3873646871':
  Do not try non-dwarf local unwinds for x86.