am 5d26339a: DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes.

Merge commit '5d26339aed33942ba82bfdb79e1b7e9a832c96a7' into eclair-mr2-plus-aosp

* commit '5d26339aed33942ba82bfdb79e1b7e9a832c96a7':
  DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes.