Merge "Use ParcelDescriptor.fromSocket instead of getFileDescriptor"