4.7 GCC build fixes

Change-Id: Iec485438e2a3328a93c4d74b8fdc5625b9f9aaea