Merge "Add INetd to SystemServiceRegistry"
am: e3f18bd77c

Change-Id: I510c964ead030f3522c26c123e709117c7c14f6a