am 5de028bf: Merge "Remove extraneous CFI from x86 entrypoints to fix backtrace."

* commit '5de028bf066052afd15c6733a4e6edfe91ad222c':
  Remove extraneous CFI from x86 entrypoints to fix backtrace.