New C++11 fix for AOSP master.

It's good I'm finding these now, it should make a 4.5/5.0 release much quicker.