commit 7cd46d3ee6c0415b11a692a8f3913f7be5165200
author Lorenzo Colitti <lorenzo@google.com> Sun Jan 28 23:06:50 2018 +0900
committer Lorenzo Colitti <lorenzo@google.com> Wed Jan 31 11:03:26 2018 +0900
tree 2ce916ebd2e8e4f2d382e51f83677c6e4ccda0ad
parent eaa6720d60cb1e977f6fd158d20f051975a8f2e7

Fix tests to pass on newer versions of scapy.

1. New versions of scapy no longer use the "unused" field to
   indicate the MTU in an IPv4 fragmentation needed packet,
   correctly calling it "nexthopmtu" instead. Add code to
   support both old and new versions.
2. Replace "load" with "payload" in the null encryption code.

Bug: 36510518
Test: IPv4 PMTU tests pass on device
Test: null encryption xfrm tests pass on device
Test: all_tests.sh pass on android-4.9
Change-Id: Id414080d06ac9ffa66aa5053f6dcc5e5869060a9