Merge "rename services-stub-sources filegroup to services-all-sources"