pimanattr + I reviewed all diffs against upstream libc++abi trunk. Fixed...

... bad merges.

Previously, we stomped over logan's changes to a number of files (eg
cxa_personality.cpp).

This is a much thorough scrubbing. After this patch, all libc++abi tests
except for 1 pass.

Change-Id: I43bbb796a74000699d184befbd2e5599e1917249