Makefile cleanups

Change-Id: I69b8b81d357553c979682d42097eba864c951512
4 files changed