Merge "Fix cfi information for x86." into mnc-dev