Merge "Use extern "C" rather than BEGIN/END_DECLS."