Merge "x86 Fast Interpreter: Fix CFI"