Merge "C++17 is now the default." am: a4b74660a2
am: da87885233

Change-Id: I3ad6da3ef83a7a17f49b7388e8c9d9958d79b205
diff --git a/keystore/Android.bp b/keystore/Android.bp
index 366f591..c1d81b3 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -13,7 +13,6 @@
     },
 
     clang: true,
-    cpp_std: "c++17",
 }
 
 cc_binary {