Merge "Don't use private libc++ macros."