Fix some rebasing fallout pertaining to today's AVX2 landing.
Fixes #317463.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2704 8f6e269a-dfd6-0310-a8e1-e2731360e62c