Merge "Reduce strerror(3)'s impact on .data.rel.ro."
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index 59e1b92..97e85f8 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -3,8 +3,6 @@
 
     defaults: ["llvm-build-host-tools-defaults"],
 
-    cpp_std: "gnu++17",
-
     // b/117120485 bugprone-exception-escape hangs with DeclarationDatabase.cpp
     tidy_checks: ["-bugprone-exception-escape"],