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

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