Make it compile with Apple's Clang and libc++

Change-Id: I45feb0d715e6e823a42c7960fd87346412ebcc48