Merge "Fix cfi directives in small strncmp case."