Merge "versioner: properly handle extern "C", "C++"."