am 3f6c18a1: am 7f728177: Merge "__unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form."

* commit '3f6c18a19de6b4c4756733535e51fa5425687c98':
  __unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form.