Fix merge fallout.

Use flag_enable_cilkplus instead of flag_enable_cilk.
4 files changed