8226: regenerate makefiles after cleanup

* Derp

Change-Id: Iaa9bcc1df3511a9a0ddce69f1dd962ad74aab99c