Merge "Fix DatagramChannelImpl.setOption(IP_MULTICAST_IF, value) for dual-stack." into rvc-dev am: dc89e90c94 am: b4b9f288de

Change-Id: Ib3754869c2c3f512e3b1328dde892db296728c1b