Fix C++11 build.

Not sure how this slipped past my checkbuild...

Change-Id: Id238887a2a47ced387a6128a772fad3e468096be
Merge "Fix C++11 build."