icmp6.h - add captive portal and pref64 nd opts am: d807cf36d5 am: 3f77f371a7

Change-Id: Icca3f3286f0f97d44156f1b25c8d7f0ff6d159c4