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

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

Change-Id: I157dd2190f5b804e0af74f9dba89e29c83aa48a6