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

Change-Id: I19483b663eaaa88aecc96db403e703d06c63bd73