Merge "Use filegroup defaults for framework sources"