Snap for 10453563 from 5acdcc8a48fa60e1dda80ed7b044a229bbf7e0c1 to mainline-ipsec-release

Change-Id: Id014c1c7496d0a24505cbd08f7734606abe3c191
diff --git a/util/nanotool/Android.bp b/util/nanotool/Android.bp
index bf8b320..b43271b 100644
--- a/util/nanotool/Android.bp
+++ b/util/nanotool/Android.bp
@@ -49,7 +49,6 @@
         "libutils",
     ],
 
-    cpp_std: "c++11",
     cflags: [
         "-Wall",
         "-Werror",