Correct comment about set_registers's parameters
Merge pull request #72 from awong-dev/fix_bad_merges

pimanattr + awong 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.
Merge branch 'master' of github.com:awong-dev/ndk into jroelofs-work
Do __cxa_begin_cleanup before set_registers().

In the case where we found an exception handler in phase 1,
we are doing set_registers() without doing __cxa_begin_cleanup,
then returning _URC_INSTALL_CONTEXT.

In the other case, where we did not find an exception handler,
we do __cxa_begin_cleanup first. Make the common case where
we found a handler match this behaviour so that __cxa_end_cleanup
will work.

Change-Id: If255889c2b87eae10a13a4c75e0ff9abf0a7d27a