Prevent birth defects

PD found this stuff somewhere on the internet, and decided to stick it in these
makefiles... they caused clang warnings and may have caused systematic funk

This reverts commit 6bc2058da354fd8b7527e062016b62afece9ff9b.

Change-Id: I763aa334acd05d092e4c28fff7d3271e586fc18b