Build fix (for gcc 4.7).

Change-Id: Ib52cfc8ba45361277ef8e0b6021a03c3ff8ae668