am ef995f83: am 0b8ecb32: Merge "Remove extern "C" barriers to using C++."

* commit 'ef995f832206c08e6e6374e0fa84698027c1f7b6':
  Remove extern "C" barriers to using C++.