Merge "x86 Fast Interpreter: Fix CFI"
am: 4626786291

* commit '462678629165f16df563b31b232d3f4ff69a7c23':
  x86 Fast Interpreter: Fix CFI