am 24db1bc5: Merge "Fix cfi information for x86."

* commit '24db1bc55bf8fb3240690436a229352453ae75e1':
  Fix cfi information for x86.