Merge "__unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form."