Merge "Unhide ICMP echo constants."
am: 82d1361e6d

Change-Id: I1dad509eb0b56666cde0399dfcbaea050ce30630