In condvar wait functions, set the holder back before restoring count

Before this fix, there is a racing condition. The previous owner thread
can get into the mutex without proper locking by passing the lock owner
check in mutex_lock function.
bug 5699382

Change-Id: Ib81330e2f3669e5f72b101f3da7abdb15d3ac993