Merge WebView M40 build 1832189 into AOSP.
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 93aa479..5fb1b71 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -63,7 +63,7 @@
 MY_CFLAGS_Debug := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -163,7 +163,7 @@
 MY_CFLAGS_Release := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index e8c4573..35788d2 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -62,7 +62,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Debug := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -150,7 +150,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 8c27410..1319b81 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -62,7 +62,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Debug := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -156,7 +156,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index e64fa21..5b0cea6 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -63,7 +63,7 @@
 MY_CFLAGS_Debug := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -156,7 +156,7 @@
 MY_CFLAGS_Release := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 93aa479..5fb1b71 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -63,7 +63,7 @@
 MY_CFLAGS_Debug := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -163,7 +163,7 @@
 MY_CFLAGS_Release := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index e8c4573..35788d2 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -62,7 +62,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Debug := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -150,7 +150,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 8c27410..1319b81 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -62,7 +62,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Debug := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -156,7 +156,7 @@
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index e64fa21..5b0cea6 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -63,7 +63,7 @@
 MY_CFLAGS_Debug := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \
@@ -156,7 +156,7 @@
 MY_CFLAGS_Release := \
 	-fstack-protector \
 	--param=ssp-buffer-size=4 \
-	 \
+	-Werror \
 	-fno-strict-aliasing \
 	-Wall \
 	-Wno-unused-parameter \