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

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