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

Change-Id: I9270b5fe65e4082267fa6e30b4489049718a6351