am 08c08f72: Merge "Move netd_client into netd."

* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
  Move netd_client into netd.