Merge "Add C++ thread annotations support to core." into nyc-dev am: 77746f2  -s ours
am: dc53f5b

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

Change-Id: I9373d833673a46320565780d4dd16d84fee5a3ea