Merge "Make Inet6AddressImpl.icmpEcho() more tolerant." am: 5641519173 am: 43b301c6f0
am: ffe57d4e3b

Change-Id: I5cc9a2705b6ff3ee18b40a0dd4024fc968a5b3f3