Merge "Remove extern "C" barriers to using C++."