Update Noto CJK and Noto Emoji to new versions

Noto Color Emoji: v2.034
Noto Sans CJK:    v2.004
Noto Serif CJK:   v2.000

TESTED: Tryjob successfully ran and imported the specified files from Git.

Bug: b/205888264
Bug: b/205889110
Change-Id: I19c639b74053be11ec87401a74a5f1424535b380
diff --git a/contents.json b/contents.json
index 2efe45f..8cea9ca 100644
--- a/contents.json
+++ b/contents.json
@@ -64,20 +64,20 @@
   {
     "destination": "noto-cjk",
     "files": [
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Black.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Bold.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-DemiLight.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Light.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Medium.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Regular.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSansCJK-Thin.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-Black.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-Bold.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-ExtraLight.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-Light.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-Medium.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-Regular.ttc",
-      "github.com/googlefonts/noto-cjk/NotoSerifCJK-SemiBold.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Black.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Bold.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-DemiLight.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Light.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Medium.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Regular.ttc",
+      "github.com/googlefonts/noto-cjk/Sans/OTC/NotoSansCJK-Thin.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-Black.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-Bold.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-ExtraLight.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-Light.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-Medium.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-Regular.ttc",
+      "github.com/googlefonts/noto-cjk/Serif/OTC/NotoSerifCJK-SemiBold.ttc",
       "github.com/googlefonts/noto-cjk/LICENSE"
     ]
   },
diff --git a/manifest.xml b/manifest.xml
index 523d859..25a8c57 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -32,13 +32,13 @@
         path="github.com/googlefonts/noto-cjk"
         remote="https://fuchsia.googlesource.com/third_party/github.com/googlefonts/noto-cjk"
         remotebranch="upstream/master"
-        revision="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"/>
+        revision="9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"/>
     <project
         name="github.com/googlefonts/noto-emoji"
         path="github.com/googlefonts/noto-emoji"
         remote="https://fuchsia.googlesource.com/third_party/github.com/googlefonts/noto-emoji"
         remotebranch="master"
-        revision="3a33d7d0c4f1bc1d7b309a3a100c811db78f821f"/>
+        revision="9e54fdac4229639acb90d6b564db46613a0094e7"/>
     <project
         name="github.com/googlefonts/noto-fonts"
         path="github.com/googlefonts/noto-fonts"