Fix build on gcc 4.7/4.8

Change-Id: Ib3d7831cd1994560a34c356f0bf8f86140b02b7d