Update makefiles after merge of Chromium at r221681

This commit was generated by merge_from_chromium.py.

Change-Id: If0937d6793e8017c8ed1f0f4c817bd1ab26fbbe9
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 38dd03d..d8ca735 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -629,6 +629,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -728,6 +729,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 34d264a..cb4ae3c 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -626,6 +626,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -722,6 +723,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 68e066b..04fc83a 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -634,6 +634,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -742,6 +743,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 38dd03d..d8ca735 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -629,6 +629,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -728,6 +729,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 34d264a..cb4ae3c 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -626,6 +626,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -722,6 +723,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 68e066b..04fc83a 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -634,6 +634,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \
@@ -742,6 +743,7 @@
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
+	'-DCLD_VERSION=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
 	'-DMONOLITH' \