Makefile: attempt to fix build errors using gcc-4.7 or newer.

Change-Id: I190ae4d884478ab802be52499c0b1e623b517a78