More C++11 compatibility.

Bug: 18466763
Change-Id: Ia308b7c8017cfdb7bebf5c307730ef3f0ef6f572
1 file changed