Merge "Add filegroups for services.* libraries"