Merge "Add C++ thread annotations support to core."