Merge "Revert "Expose correct FileDescriptor in DatagramSocketAdaptor""