Merge "Update makefiles to use filgroup syntax."