Use CLock instead of std::mutex, add thread-safety annotations

Use CLock instead of std::mutex, add thread-safety annotations #555