diff --git a/DEPS b/DEPS
index c3b9a17..3481be1 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build
   # and whatever else without interference from each other.
-  'build_revision': '1343ce81aab4e198c313b113ce278393187dc65c',
+  'build_revision': 'e6942ef1c557b2ae17d993ebf83d8b3c10cf3061',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling buildtools
   # and whatever else without interference from each other.
@@ -45,7 +45,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling clang
   # and whatever else without interference from each other.
-  'clang_revision': 'ba668f13d135f1d01faf9b03c9a05f5877ac3f51',
+  'clang_revision': 'de043ecd5b2bd5dc3627a16cf91770a1c65ab440',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling clang_dsymutil
   # and whatever else without interference from each other.
diff --git a/core/fxge/cfx_textrenderoptions.h b/core/fxge/cfx_textrenderoptions.h
index b216b97..19d30af 100644
--- a/core/fxge/cfx_textrenderoptions.h
+++ b/core/fxge/cfx_textrenderoptions.h
@@ -24,6 +24,8 @@
   constexpr explicit CFX_TextRenderOptions(AliasingType type)
       : aliasing_type(type) {}
   constexpr CFX_TextRenderOptions(const CFX_TextRenderOptions& other) = default;
+  CFX_TextRenderOptions& operator=(const CFX_TextRenderOptions& other) =
+      default;
 
   // Indicates whether anti-aliasing is enabled.
   bool IsSmooth() const {
diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt
similarity index 100%
rename from tools/msan/blacklist.txt
rename to tools/msan/ignorelist.txt