Merge "Fix cpu_set_t"