remove duplicate stuff after merge; reduce downstream diff

Change-Id: I662a8fc24f776ebf30476e6d638b22bb63d94e5a
Meh. Not that big of a deal.

At some point, we should just not use unwind.h for EHABI.