Prepare for gcc4.8

Change-Id: I7df82daaa41aec6bd1cf2e69f248a87a57702977