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

* commit '16364599e07e0c45eaf3ef65bf7de0c363de2519':
  Fix cfi information for x86.