Merge "Build service-connectivity with system_server API"