Merge "icmp: prevent stripping off ipv4 header twice on darwin"