diff --git a/Android.bp b/Android.bp
index c28dc3be..41075d23 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,8 +24,6 @@ cc_defaults {
         "-Wall",
         "-Werror",
     ],
-
-    cpp_std: "c++17",
 }
 
 cc_library {
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 7e33261e..370232b3 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -15,7 +15,6 @@
 cc_defaults {
     name: "minadbd_defaults",
 
-    cpp_std: "gnu++17",
     cflags: [
         "-DADB_HOST=0",
         "-Wall",