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

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