Clean up makefiles

Change-Id: I76f1909565905e1c07f44c1660d24d806f94c95e