Merge "[x86] Fix errors with WITH_JIT_TUNING defined"