Merge commit '275acdff' into eclair-plus-aosp * commit '275acdff': Copy Froyo's version of MulticastSocketTest to Eclair for CTS.