Merge "Migrate INetd to stable aidl"
am: 9677dde14a

Change-Id: If2b5208206e2e58b12e0274fab85809685402496