Move netd specific program back to netd am: 47e92158ca am: f8b9dee2d8
am: d10841f90c

Change-Id: Ie97eafa94f66a8e6d04e47a61b655996da796a32