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

Change-Id: I326e91ba97b77f0b62b372dd8bddc7bca77e41d7