Revert r166370 and r166540 now that Xcode 4.6 has been available for a while.

Those changes were added as a temporary workaround for Xcode 4.5 passing the
-Wno-arc-abi option.  Xcode 4.6 does not pass that option so this should no
longer be necessary.