Update makefiles after merge of Chromium at 223269

This commit was generated by merge_from_chromium.py.

Change-Id: Ifcdc7e1cc776f47edb2286dc816450e2d2179942
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 9788cef..c4da0f7 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -90,7 +90,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -177,7 +176,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 08a8468..3d8f4da 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -90,7 +90,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -177,7 +176,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 4376e23..8357db3 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -92,7 +92,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -182,7 +181,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 9788cef..c4da0f7 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -90,7 +90,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -177,7 +176,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 08a8468..3d8f4da 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -90,7 +90,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -177,7 +176,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 4376e23..8357db3 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -92,7 +92,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \
@@ -182,7 +181,6 @@
 	'-DDISABLE_NACL' \
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DUSE_XI2_MT=2' \
 	'-DUSE_PROPRIETARY_CODECS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DENABLE_GPU=1' \