[genproj] Sync with latest set of changes to Makefiles