Also Mutex2.

(Note, Mutex2 and Cond2 are replaced by standard C++ downstream.)

Signed-off-by: Matt Benjamin <matt@linuxbox.com>