diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 178c02752baa1..94e9588a9b1ee 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -222,10 +222,6 @@ SK_API void SkDebugf_FileLine(const char* file,
 #define SK_SUPPORT_LEGACY_AAA_CHOICE
 #endif
 
-#ifndef SK_SUPPORT_LEGACY_CPU_EMOJI
-#define SK_SUPPORT_LEGACY_CPU_EMOJI
-#endif
-
 // We're turning this off indefinitely,
 // until we can figure out some fundamental problems with its approach.
 //
diff --git a/third_party/blink/web_tests/platform/linux/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/text-antialias/font-format-support-color-cff2-expected.png
index b0b1dbd3e471e..6c452678c8002 100644
Binary files a/third_party/blink/web_tests/platform/linux/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/linux/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt
deleted file mode 100644
index 113de1a8d9a99..0000000000000
--- a/third_party/blink/web_tests/platform/linux/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a testharness.js-based test.
-PASS Animated style is cleared after canceling a running CSS animation
-PASS Animated style is cleared after canceling a filling CSS animation
-PASS After canceling an animation, it can still be seeked
-PASS After canceling an animation, it can still be re-used
-PASS After canceling an animation, updating animation properties doesn't make it live again
-PASS After canceling an animation, updating animation-play-state doesn't make it live again
-PASS Setting animation-name to 'none' cancels the animation
-FAIL Setting display:none on an element cancel its animations assert_equals: expected "idle" but got "running"
-FAIL Setting display:none on an ancestor element cancels animations on descendants assert_equals: expected "idle" but got "running"
-Harness: the test ran to completion.
-
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/text-antialias/font-format-support-color-cff2-expected.png
index fb0ccd3553ca5..4ab815d9e5d56 100644
Binary files a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/text-antialias/font-format-support-color-cff2-expected.png
index 207d27e6aab27..5b17a001702be 100644
Binary files a/third_party/blink/web_tests/platform/mac-mac10.12/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/mac-mac10.12/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/text-antialias/font-format-support-color-cff2-expected.png
index 1975b288b4de2..f70dae4505a75 100644
Binary files a/third_party/blink/web_tests/platform/mac/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/win/virtual/text-antialias/font-format-support-color-cff2-expected.png
index d79ed64ffef2e..927ef97206e37 100644
Binary files a/third_party/blink/web_tests/platform/win/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/win/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/text-antialias/font-format-support-color-cff2-expected.png b/third_party/blink/web_tests/platform/win7/virtual/text-antialias/font-format-support-color-cff2-expected.png
index fb25a120aceeb..3e02dfa534f1a 100644
Binary files a/third_party/blink/web_tests/platform/win7/virtual/text-antialias/font-format-support-color-cff2-expected.png and b/third_party/blink/web_tests/platform/win7/virtual/text-antialias/font-format-support-color-cff2-expected.png differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt
deleted file mode 100644
index 113de1a8d9a99..0000000000000
--- a/third_party/blink/web_tests/platform/win7/virtual/threaded/external/wpt/css/css-animations/CSSAnimation-canceling.tentative-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a testharness.js-based test.
-PASS Animated style is cleared after canceling a running CSS animation
-PASS Animated style is cleared after canceling a filling CSS animation
-PASS After canceling an animation, it can still be seeked
-PASS After canceling an animation, it can still be re-used
-PASS After canceling an animation, updating animation properties doesn't make it live again
-PASS After canceling an animation, updating animation-play-state doesn't make it live again
-PASS Setting animation-name to 'none' cancels the animation
-FAIL Setting display:none on an element cancel its animations assert_equals: expected "idle" but got "running"
-FAIL Setting display:none on an ancestor element cancels animations on descendants assert_equals: expected "idle" but got "running"
-Harness: the test ran to completion.
-