Move netd specific program back to netd
am: 47e92158ca

Change-Id: Id77610beb224e678844379acf98557a0026179b7