Merge "bionic libc tests: clean up test_netinet_icmp.c file"