Merge "Remove vintf_service."