Allow building with 4.7 GCC

Change-Id: Iace0846c1322b3f681ef27fa8b211494e761333d