Merge "Unhide ICMP echo constants."
am: 3d162d8471

Change-Id: I7cabe228c912a0ccfd8bd62e6ca545be348c0e22