am e851c562: Merge change Iea75a523 into eclair

Merge commit 'e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp

* commit 'e851c562ee5eb514135b5066553fcef6b0e5c333':
  Fixes for socket options on multicast sockets.