Merge "Convert NetdClient to use Soong"