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

* commit 'f8733c63aa7b7de8350264295a2c2c080b5307a4':
  Move netd_client into netd.