Merge "Add C++ thread annotations support to core."
am: e65f8be

* commit 'e65f8bedec4b479abfe18c53ccf8828960302cf2':
  Add C++ thread annotations support to core.