fix errors for compile with gcc 4.9

Change-Id: I0640f4578854849642f86cc4485fc69c4446f62f