Revert "Update makesystem for fuel-main repo"

This reverts commit 31add099efe6822068f2448135c9609f17e37b87.

Change-Id: I1f0c870608d9410c802402775c8743bdd4a27fea