Merge "Fix addition of extra arg to cfi_restore."