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

Change-Id: I716e9e6a92e7a537e77a1f2da95d11e92873fde1