Revert "Makefile: fix build with gcc 4.8"

This reverts commit 694820844465f2db0bfcf9ced904ecc8880533a6.

Change-Id: Ib31890a44e4f56466d9aaa916b561b04c4d151e1