fix build with GCC > 4.8

Change-Id: Ief95a598614774cd1f6b9e11bf538be2cdea29d9
yeat another GCC > 4.8 fix

Change-Id: I01452d4a9d7ad3244e7776083ddc24c330b363e6