am 02c72357: (-s ours) am f8733c63: am 08c08f72: Merge "Move netd_client into netd."

* commit '02c723579d0ee4e06da59cd58b579ff8ff76965e':
  Move netd_client into netd.