Revert "Makefile: fixes for GCC 4.9.1 Linaro compatibility"

This reverts commit 3929a160b36c95a64d3a9a6ecca76851b65fadd8.

Change-Id: I37a463306f4ac460ac0a9e3c2e9f6a60edeeebc1