Changes to make it compile with Google's GCC 4.7 toolchain.

Change-Id: I2d6cdcfbe18449eef8d8b92b9ea14c66963fdf3c

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Signed-off-by: eugenesan (eugenesan) <eugenesan@gmail.com>

Conflicts:
	Makefile