Makefile: fixes for GCC 4.9.1 Linaro compatibility

Conflicts:
	Makefile

Change-Id: I0daaf09c429a2cf8b58d29a0c6ca2207e2d04a91