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

Change-Id: I02db2b7fee8c5334f7e64ffd256cba9d320e0797