Fix AVX double compile error

Introduced by fa181964de6c9

Note that this change will be included in the 4.6 release, therefore
this commit will effectively be the one that the 4.6 release is made
from instead of the parent.

Change-Id: Ieeede7d15109f2c44fcd2e0ef59eff2944206eab