am 22ee0902: Merge "Fix cfi information for x86." into mnc-dev

* commit '22ee090292e9f2ab0326600a467294ecb8b0e2ad':
  Fix cfi information for x86.