Merge "Cleanup libc++ configuration."