(Just one small fix for building against libc++, an unknown amount of
more difficult issues left to solve.)

Change-Id: I9789b8d76aa214558ab4baad823b6650ebc640d3