fix build with 4.8+ GCC

Change-Id: I7c9265dcb9bec134d6e54b65701619b1b6cf8daa