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

* commit '03e16bddadaba5d8374261a7503bc48a0aeff080':
  x86 Fast Interpreter: Fix CFI