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

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

Conflicts:
	Makefile

Change-Id: Ia94ea51dc100295f32c8e240bbdfc0fa4ef2fa3b