Cleanup make as per CM

Change-Id: Ic15ff479ca819f8c3f3b49e0dbf257ca92138393