diff --git a/bluetooth/V1_0/build/Android.bp b/bluetooth/V1_0/build/Android.bp
index 1c18ab4..d289977 100644
--- a/bluetooth/V1_0/build/Android.bp
+++ b/bluetooth/V1_0/build/Android.bp
@@ -76,7 +76,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -135,7 +134,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/boot/V1_0/build/Android.bp b/boot/V1_0/build/Android.bp
index 259abea..f020db0 100644
--- a/boot/V1_0/build/Android.bp
+++ b/boot/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/configstore/V1_0/build/Android.bp b/configstore/V1_0/build/Android.bp
index 704c638..373af03 100644
--- a/configstore/V1_0/build/Android.bp
+++ b/configstore/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/ir/V1_0/build/Android.bp b/ir/V1_0/build/Android.bp
index afc7ade..2b91e17 100644
--- a/ir/V1_0/build/Android.bp
+++ b/ir/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/nfc/V1_0/build/Android.bp b/nfc/V1_0/build/Android.bp
index a1b4ddd..53209c9 100644
--- a/nfc/V1_0/build/Android.bp
+++ b/nfc/V1_0/build/Android.bp
@@ -76,7 +76,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -135,7 +134,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/radio/V1_0/build/Android.bp b/radio/V1_0/build/Android.bp
index 1d3d3e3..e6f03ef 100644
--- a/radio/V1_0/build/Android.bp
+++ b/radio/V1_0/build/Android.bp
@@ -85,7 +85,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -150,7 +149,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/radio/V1_1/build/Android.bp b/radio/V1_1/build/Android.bp
index 2b5bc5e..36a629e 100644
--- a/radio/V1_1/build/Android.bp
+++ b/radio/V1_1/build/Android.bp
@@ -81,7 +81,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -143,7 +142,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/radio/deprecated/V1_0/build/Android.bp b/radio/deprecated/V1_0/build/Android.bp
index d0bb51f..da9ffc2 100644
--- a/radio/deprecated/V1_0/build/Android.bp
+++ b/radio/deprecated/V1_0/build/Android.bp
@@ -78,7 +78,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -138,7 +137,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/renderscript/V1_0/build/Android.bp b/renderscript/V1_0/build/Android.bp
index f33524b..32e4db8 100644
--- a/renderscript/V1_0/build/Android.bp
+++ b/renderscript/V1_0/build/Android.bp
@@ -76,7 +76,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -135,7 +134,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/script/build/template/vts_build_template.bp b/script/build/template/vts_build_template.bp
index bc4cebd..a9070f9 100644
--- a/script/build/template/vts_build_template.bp
+++ b/script/build/template/vts_build_template.bp
@@ -67,7 +67,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -122,7 +121,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/bar/V1_0/build/Android.bp b/tests/bar/V1_0/build/Android.bp
index 06ac577..dfc5408 100644
--- a/tests/bar/V1_0/build/Android.bp
+++ b/tests/bar/V1_0/build/Android.bp
@@ -87,7 +87,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -153,7 +152,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/baz/V1_0/build/Android.bp b/tests/baz/V1_0/build/Android.bp
index cfa37fe..db0a36e 100644
--- a/tests/baz/V1_0/build/Android.bp
+++ b/tests/baz/V1_0/build/Android.bp
@@ -82,7 +82,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -145,7 +144,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/expression/V1_0/build/Android.bp b/tests/expression/V1_0/build/Android.bp
index 33e444a..9e2de50 100644
--- a/tests/expression/V1_0/build/Android.bp
+++ b/tests/expression/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/foo/V1_0/build/Android.bp b/tests/foo/V1_0/build/Android.bp
index 401bdec..7cbdc9b 100644
--- a/tests/foo/V1_0/build/Android.bp
+++ b/tests/foo/V1_0/build/Android.bp
@@ -85,7 +85,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -150,7 +149,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/hash/V1_0/build/Android.bp b/tests/hash/V1_0/build/Android.bp
index 075d7a7..dec5e2d 100644
--- a/tests/hash/V1_0/build/Android.bp
+++ b/tests/hash/V1_0/build/Android.bp
@@ -70,7 +70,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -125,7 +124,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/inheritance/V1_0/build/Android.bp b/tests/inheritance/V1_0/build/Android.bp
index f101ee0..771aa05 100644
--- a/tests/inheritance/V1_0/build/Android.bp
+++ b/tests/inheritance/V1_0/build/Android.bp
@@ -79,7 +79,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -140,7 +139,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/libhwbinder/V1_0/build/Android.bp b/tests/libhwbinder/V1_0/build/Android.bp
index 8d9fae3..c627bca 100644
--- a/tests/libhwbinder/V1_0/build/Android.bp
+++ b/tests/libhwbinder/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/memory/V1_0/build/Android.bp b/tests/memory/V1_0/build/Android.bp
index 178c5f3..73cea09 100644
--- a/tests/memory/V1_0/build/Android.bp
+++ b/tests/memory/V1_0/build/Android.bp
@@ -70,7 +70,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -125,7 +124,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/msgq/V1_0/build/Android.bp b/tests/msgq/V1_0/build/Android.bp
index 1d50e93..5957117 100644
--- a/tests/msgq/V1_0/build/Android.bp
+++ b/tests/msgq/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tests/pointer/V1_0/build/Android.bp b/tests/pointer/V1_0/build/Android.bp
index 420444a..e9a4d86 100644
--- a/tests/pointer/V1_0/build/Android.bp
+++ b/tests/pointer/V1_0/build/Android.bp
@@ -73,7 +73,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -130,7 +129,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tetheroffload/config/V1_0/build/Android.bp b/tetheroffload/config/V1_0/build/Android.bp
index f3fa00e..ac1d51c 100644
--- a/tetheroffload/config/V1_0/build/Android.bp
+++ b/tetheroffload/config/V1_0/build/Android.bp
@@ -70,7 +70,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -125,7 +124,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/tetheroffload/control/V1_0/build/Android.bp b/tetheroffload/control/V1_0/build/Android.bp
index be4fadf..d2d55b3 100644
--- a/tetheroffload/control/V1_0/build/Android.bp
+++ b/tetheroffload/control/V1_0/build/Android.bp
@@ -76,7 +76,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -135,7 +134,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/wifi/V1_0/build/Android.bp b/wifi/V1_0/build/Android.bp
index 936e8a8..1951f58 100644
--- a/wifi/V1_0/build/Android.bp
+++ b/wifi/V1_0/build/Android.bp
@@ -109,7 +109,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -190,7 +189,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
diff --git a/wifi/supplicant/V1_0/build/Android.bp b/wifi/supplicant/V1_0/build/Android.bp
index 20f1641..ef5841c 100644
--- a/wifi/supplicant/V1_0/build/Android.bp
+++ b/wifi/supplicant/V1_0/build/Android.bp
@@ -106,7 +106,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],
@@ -185,7 +184,6 @@
 
         // These warnings are in code generated with vtsc
         // b/31362043
-        "-Wno-unused-private-field",
         "-Wno-duplicate-decl-specifier",
         "-Wno-implicitly-unsigned-literal",
     ],