Merge "Fix CFI initialization crash on x86."