Reset back to original makefiles

Change-Id: Iabc4e6eea95ef2082499ef397219770dbe8d4975