This is causing more harm than good. We'll just make these all link libc++ again (another revert) and work out the CTS issues if they still exist. Bug: 19778891 This reverts commit a5113a15. Change-Id: I35a4c93dae4abb66e3525451d5ce01e33a540895