Merge "Don't use private libc++ macros." am: 296f7dad19 am: d187f3c5ee am: 1a102eb0c5
am: ac75570e71

Change-Id: I2445f0ed3f36257ad7ea7cf38813d2d23f6ecbc5