remove duplicate stuff after merge; reduce downstream diff

Change-Id: I662a8fc24f776ebf30476e6d638b22bb63d94e5a
Not sure about removing this TODO – not really part of moving Unwind-EHABI.cpp off the unw_ functions either. Should've probably left it in, in hindsight :-/