Merge "Use an @hide libcore API to get the FileDescriptor from a Socket."