misc: Fix compilation under GCC 4.7

Change-Id: Iddd9f528d168d440b532f0db551c3b6f58fa05ce
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
hercules: update config

Change-Id: I3856ba9293de5902f90556fa20fbb1bf54740df0