Merge "Support IPv4-compatible IPv6 addresses on IPv4 sockets." into dalvik-dev