Merge "Move lingering services to services.jar."