Merge "Fix cfi information for x86."