Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: d6c2dc5908
am: db15177cf7

Change-Id: I8b89e88d1db96581ab91d649e5af621c499669ed