(Note that we don't build successfully against libc++ currently; this
is just a fix for the first issue that I came across when trying.)

Change-Id: If8b594177434e96a8b51c372b26a72236b9b5f5e