Prepare for gcc4.8

Change-Id: I7e5a88a81c3543082a01058fb73e54e35f6f762a