Merge "Update ping to one that understands IPPROTO_ICMP"