Merge "Add C++ thread annotations support to core." into nyc-dev