Merge "Add proper cfi directives."