Merge "Revert "Switch to libc++""