Merge "Remove extraneous CFI from x86 entrypoints to fix backtrace."