Merge "Move netd_client into netd."