Merge "Don't use private libc++ macros."
am: 296f7dad19

Change-Id: If4b64581a39e2cd3e51fda1ac34dcf2b99cb4197