Update vxlan cherry-pick

Patch set 8 was broken.  Use patch set 9, which works correctly.