volk: fixed rotatorpuppet for avx.
Merge branch 'maint'
Merge branch 'master' into next