Merge "Create a filegroup for public stub sources"