Merge change Iea75a523 into eclair
Android (Google) Code Review authored
* changes:
  Fixes for socket options on multicast sockets.
e851c562