Snap for 12042346 from 58116e4aa4a57bc9a9f1e9caf191193becba2498 to 24Q4-release

Change-Id: Ie504fe3531cf9e0f7e6b2e046fd38595f7725b3c
diff --git a/Android.bp b/Android.bp
index 62c7e0c..78e5443 100644
--- a/Android.bp
+++ b/Android.bp
@@ -62,7 +62,6 @@
     cppflags: [
         "-DHWC2_INCLUDE_STRINGIFICATION",
         "-DHWC2_USE_CPP11",
-        "-std=c++17",
     ],
 
     relative_install_path: "hw",