[fonts] Add CIPD sources and metadata for Droid, Noto Sans, et al.

Adding imports for several open-source fonts:

* Alegreya Sans SC
* Cutive Mono
* Droid Sans
* Droid Sans Mono
* Droid Serif
* Noto Color Emoji
* Noto Naskh UI
* Noto Sans (several scripts)
* Noto Sans UI (several scripts)
* Nanum Gothic
* Quintessential
* Short Stack

Do not submit until fxb/42256 is resolved.

Bug: 8880
Bug: 35895
Bug: 39586

Change-Id: I0874a6053119472399d6d6029209fc1a4d045de6
diff --git a/contents.json b/contents.json
index 69ebb96..b859bea 100644
--- a/contents.json
+++ b/contents.json
@@ -6,6 +6,126 @@
     ]
   },
   {
+    "destination": "alegreyasanssc",
+    "files": [
+      "github.com/google/fonts/ofl/alegreyasanssc/AlegreyaSansSC-Bold.ttf",
+      "github.com/google/fonts/ofl/alegreyasanssc/AlegreyaSansSC-BoldItalic.ttf",
+      "github.com/google/fonts/ofl/alegreyasanssc/AlegreyaSansSC-Italic.ttf",
+      "github.com/google/fonts/ofl/alegreyasanssc/AlegreyaSansSC-Regular.ttf",
+      "github.com/google/fonts/ofl/alegreyasanssc/OFL.txt"
+    ]
+  },
+  {
+    "destination": "cutivemono",
+    "files": [
+      "github.com/google/fonts/ofl/cutivemono/CutiveMono-Regular.ttf",
+      "github.com/google/fonts/ofl/cutivemono/OFL.txt"
+    ]
+  },
+  {
+    "destination": "droidsans",
+    "files": [
+      "github.com/google/fonts-with-droid/apache/droidsans/DroidSans-Bold.ttf",
+      "github.com/google/fonts-with-droid/apache/droidsans/DroidSans-Regular.ttf",
+      "github.com/google/fonts-with-droid/apache/droidsans/LICENSE.txt"
+    ]
+  },
+  {
+    "destination": "droidsansmono",
+    "files": [
+      "github.com/google/fonts-with-droid/apache/droidsansmono/DroidSansMono-Regular.ttf",
+      "github.com/google/fonts-with-droid/apache/droidsans/LICENSE.txt"
+    ]
+  },
+  {
+    "destination": "droidserif",
+    "files": [
+      "github.com/google/fonts-with-droid/apache/droidserif/DroidSerif-Bold.ttf",
+      "github.com/google/fonts-with-droid/apache/droidserif/DroidSerif-BoldItalic.ttf",
+      "github.com/google/fonts-with-droid/apache/droidserif/DroidSerif-Italic.ttf",
+      "github.com/google/fonts-with-droid/apache/droidserif/DroidSerif-Regular.ttf",
+      "github.com/google/fonts-with-droid/apache/droidsans/LICENSE.txt"
+    ]
+  },
+  {
+    "destination": "material",
+    "files": [
+      "github.com/google/material-design-icons/iconfont/MaterialIcons-Regular.ttf",
+      "github.com/google/material-design-icons/LICENSE"
+    ]
+  },
+  {
+    "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/LICENSE"
+    ]
+  },
+  {
+    "destination": "noto-emoji",
+    "files": [
+      "github.com/googlefonts/noto-emoji/fonts/NotoColorEmoji.ttf",
+      "github.com/googlefonts/noto-emoji/fonts/LICENSE"
+    ]
+  },
+  {
+    "destination": "notonaskhui",
+    "files": [
+      "github.com/googlefonts/noto-fonts/unhinted/NotoNaskhArabicUI/NotoNaskhArabicUI-Regular.ttf"
+    ]
+  },
+  {
+    "destination": "notosans",
+    "files": [
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansArmenian/NotoSansArmenian-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansEthiopic/NotoSansEthiopic-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansGeorgian/NotoSansGeorgian-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansHebrew/NotoSansHebrew-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansKannada/NotoSansKannada-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansTelugu/NotoSansTelugu-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/LICENSE"
+    ]
+  },
+  {
+    "destination": "notosansui",
+    "files": [
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansBengaliUI/NotoSansBengaliUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansDevanagariUI/NotoSansDevanagariUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansGujaratiUI/NotoSansGujaratiUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansMalayalamUI/NotoSansMalayalamUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansTamilUI/NotoSansTamilUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/unhinted/NotoSansThaiUI/NotoSansThaiUI-Regular.ttf",
+      "github.com/googlefonts/noto-fonts/LICENSE"
+    ]
+  },
+  {
+    "destination": "nanumgothic",
+    "files": [
+      "github.com/google/fonts/ofl/nanumgothic/NanumGothic-Regular.ttf",
+      "github.com/google/fonts/ofl/nanumgothic/OFL.txt"
+    ]
+  },
+  {
+    "destination": "quintessential",
+    "files": [
+      "github.com/google/fonts/ofl/quintessential/Quintessential-Regular.ttf",
+      "github.com/google/fonts/ofl/quintessential/OFL.txt"
+    ]
+  },
+  {
     "destination": "roboto",
     "files": [
       "github.com/google/fonts/apache/roboto/Roboto-BlackItalic.ttf",
@@ -62,30 +182,10 @@
     ]
   },
   {
-    "destination": "material",
+    "destination": "shortstack",
     "files": [
-      "github.com/google/material-design-icons/iconfont/MaterialIcons-Regular.ttf",
-      "github.com/google/material-design-icons/LICENSE"
-    ]
-  },
-  {
-    "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/LICENSE"
+      "github.com/google/fonts/ofl/shortstack/ShortStack-Regular.ttf",
+      "github.com/google/fonts/ofl/shortstack/OFL.txt"
     ]
   }
 ]
\ No newline at end of file
diff --git a/fuchsia.font_catalog.json b/fuchsia.font_catalog.json
index c2f8a38..450d8ee 100644
--- a/fuchsia.font_catalog.json
+++ b/fuchsia.font_catalog.json
@@ -3,272 +3,12 @@
   "version": "1",
   "families": [
     {
-      "name": "Roboto",
-      "fallback": true,
-      "generic_family": "sans-serif",
-      "aliases": [
-        {
-          "names": [
-            "Roboto Condensed"
-          ],
-          "width": "condensed"
-        }
-      ],
+      "$comment": "Used for CaptionFontFamily.SmallCapitals",
+      "name": "Alegreya Sans SC",
+      "fallback": false,
       "assets": [
         {
-          "file_name": "Roboto-BlackItalic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic",
-              "weight": 900
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Black.ttf",
-          "typefaces": [
-            {
-              "weight": 900
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-BoldItalic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic",
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Bold.ttf",
-          "typefaces": [
-            {
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Italic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-LightItalic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic",
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Light.ttf",
-          "typefaces": [
-            {
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-MediumItalic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic",
-              "weight": 500
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Medium.ttf",
-          "typefaces": [
-            {
-              "weight": 500
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Regular.ttf",
-          "typefaces": [
-            {
-              "weight": 400
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-ThinItalic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic",
-              "weight": 100
-            }
-          ]
-        },
-        {
-          "file_name": "Roboto-Thin.ttf",
-          "typefaces": [
-            {
-              "weight": 100
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-BoldItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "width": "condensed",
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-Bold.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "width": "condensed"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-Italic.ttf",
-          "typefaces": [
-            {
-              "width": "condensed",
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-LightItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "width": "condensed",
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-Light.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "width": "condensed"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoCondensed-Regular.ttf",
-          "typefaces": [
-            {
-              "width": "condensed"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Roboto Mono",
-      "fallback": true,
-      "generic_family": "monospace",
-      "assets": [
-        {
-          "file_name": "RobotoMono-BoldItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Bold.ttf",
-          "typefaces": [
-            {
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Italic.ttf",
-          "typefaces": [
-            {
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-LightItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 300,
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Light.ttf",
-          "typefaces": [
-            {
-              "weight": 300
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-MediumItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 500,
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Medium.ttf",
-          "typefaces": [
-            {
-              "weight": 500
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Regular.ttf",
-          "typefaces": [
-            {}
-          ]
-        },
-        {
-          "file_name": "RobotoMono-ThinItalic.ttf",
-          "typefaces": [
-            {
-              "weight": 100,
-              "slant": "italic"
-            }
-          ]
-        },
-        {
-          "file_name": "RobotoMono-Thin.ttf",
-          "typefaces": [
-            {
-              "weight": 100
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Roboto Slab",
-      "fallback": true,
-      "generic_family": "serif",
-      "assets": [
-        {
-          "file_name": "RobotoSlab-Bold.ttf",
+          "file_name": "AlegreyaSansSC-Bold.ttf",
           "typefaces": [
             {
               "weight": 700
@@ -276,26 +16,90 @@
           ]
         },
         {
-          "file_name": "RobotoSlab-Light.ttf",
+          "file_name": "AlegreyaSansSC-BoldItalic.ttf",
           "typefaces": [
             {
-              "weight": 300
+              "slant": "italic",
+              "weight": 700
             }
           ]
         },
         {
-          "file_name": "RobotoSlab-Regular.ttf",
+          "file_name": "AlegreyaSansSC-Italic.ttf",
           "typefaces": [
             {
-              "weight": 400
+              "slant": "italic"
             }
           ]
         },
         {
-          "file_name": "RobotoSlab-Thin.ttf",
+          "file_name": "AlegreyaSansSC-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "Used for CaptionFontFamily.MonospacedSerif",
+      "name": "Cutive Mono",
+      "fallback": false,
+      "generic_family": "monospace",
+      "assets": [
+        {
+          "file_name": "CutiveMono-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "May be used for CaptionFontFamily.ProportionalSansSerif",
+      "name": "Droid Sans",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "assets": [
+        {
+          "file_name": "DroidSans-Bold.ttf",
           "typefaces": [
             {
-              "weight": 100
+              "weight": 700
+            }
+          ]
+        },
+        {
+          "file_name": "DroidSans.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "May be used for CaptionFontFamily.MonospacedSansSerif",
+      "name": "Droid Sans Mono",
+      "fallback": true,
+      "generic_family": "monospace",
+      "assets": [
+        {
+          "file_name": "DroidSansMono.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "May be used for CaptionFontFamily.ProportionalSerif",
+      "name": "Droid Serif",
+      "fallback": true,
+      "generic_family": "serif",
+      "assets": [
+        {
+          "file_name": "DroidSerif-Bold.ttf",
+          "typefaces": [
+            {
             }
           ]
         }
@@ -322,6 +126,210 @@
       ]
     },
     {
+      "name": "Nanum Gothic",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "assets": [
+        {
+          "file_name": "NanumGothic.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "ko"
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Noto Color Emoji",
+      "fallback": true,
+      "generic_family": "emoji",
+      "assets": [
+        {
+          "file_name": "NotoColorEmoji.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Noto Naskh Arabic UI",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "aliases": [
+        {
+          "names": [
+            "Noto Naskh UI"
+          ]
+        }
+      ],
+      "assets": [
+        {
+          "file_name": "NotoNaskhArabicUI-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "ar"
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Noto Sans",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "aliases": [
+        {
+          "names": [
+            "Noto Sans Armenian"
+          ],
+          "languages": [
+            "hy"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Ethiopic"
+          ],
+          "languages": [
+            "am",
+            "gez",
+            "om",
+            "ti",
+            "wal",
+            "tig",
+            "byn"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Georgian"
+          ],
+          "languages": [
+            "ka",
+            "xmf",
+            "lzz"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Hebrew"
+          ],
+          "languages": [
+            "he",
+            "yi",
+            "jrb",
+            "jpr",
+            "sam"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Kannada"
+          ],
+          "languages": [
+            "kn",
+            "tcy"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Telugu"
+          ],
+          "languages": [
+            "te",
+            "lmn",
+            "gon",
+            "wbq"
+          ]
+        }
+      ],
+      "assets": [
+        {
+          "file_name": "NotoSansArmenian-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "hy"
+              ]
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansEthiopic-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "am",
+                "gez",
+                "om",
+                "ti",
+                "wal",
+                "tig",
+                "byn"
+              ]
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansGeorgian-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "ka",
+                "xmf",
+                "lzz"
+              ]
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansHebrew-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "he",
+                "yi",
+                "jrb",
+                "jpr",
+                "sam"
+              ]
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansKannada-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "kn",
+                "tcy"
+              ]
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansTelugu-Regular.ttf",
+          "typefaces": [
+            {
+              "languages": [
+                "te",
+                "lmn",
+                "gon",
+                "wbq"
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "TODO(kpozin): Unify Noto Sans and Noto Sans CJK using aliases",
       "name": "Noto Sans CJK",
       "aliases": [
         {
@@ -659,6 +667,211 @@
       ]
     },
     {
+      "name": "Noto Sans Mono CJK",
+      "aliases": [
+        {
+          "names": [
+            "Noto Mono CJK",
+            "Noto CJK Mono"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Mono CJK HK",
+            "Noto Sans Mono HK",
+            "Noto Mono CJK HK",
+            "Noto Mono HK"
+          ],
+          "languages": [
+            "zh-HK"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Mono CJK JP",
+            "Noto Sans Mono JP",
+            "Noto Mono CJK JP",
+            "Noto Mono JP"
+          ],
+          "languages": [
+            "ja"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Mono CJK KR",
+            "Noto Sans Mono KR",
+            "Noto Mono CJK KR",
+            "Noto Mono KR"
+          ],
+          "languages": [
+            "ko"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Mono CJK SC",
+            "Noto Sans Mono SC",
+            "Noto Mono CJK SC",
+            "Noto Mono SC"
+          ],
+          "languages": [
+            "zh-Hans"
+          ]
+        },
+        {
+          "names": [
+            "Noto Sans Mono CJK TC",
+            "Noto Sans Mono TC",
+            "Noto Mono CJK TC",
+            "Noto Mono TC"
+          ],
+          "languages": [
+            "zh-Hant",
+            "zh-Bopo"
+          ]
+        }
+      ],
+      "fallback": true,
+      "generic_family": "monospace",
+      "assets": [
+        {
+          "file_name": "NotoSansCJK-Bold.ttc",
+          "typefaces": [
+            {
+              "index": 5,
+              "languages": [
+                "ja"
+              ],
+              "weight": 700
+            },
+            {
+              "index": 6,
+              "languages": [
+                "ko"
+              ],
+              "weight": 700
+            },
+            {
+              "index": 7,
+              "languages": [
+                "zh-Hans"
+              ],
+              "weight": 700
+            },
+            {
+              "index": 8,
+              "languages": [
+                "zh-Hant",
+                "zh-Bopo"
+              ],
+              "weight": 700
+            },
+            {
+              "index": 9,
+              "languages": [
+                "zh-HK"
+              ],
+              "weight": 700
+            }
+          ]
+        },
+        {
+          "file_name": "NotoSansCJK-Regular.ttc",
+          "typefaces": [
+            {
+              "index": 5,
+              "languages": [
+                "ja"
+              ]
+            },
+            {
+              "index": 6,
+              "languages": [
+                "ko"
+              ]
+            },
+            {
+              "index": 7,
+              "languages": [
+                "zh-Hans"
+              ]
+            },
+            {
+              "index": 8,
+              "languages": [
+                "zh-Hant",
+                "zh-Bopo"
+              ]
+            },
+            {
+              "index": 9,
+              "languages": [
+                "zh-HK"
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Noto Sans UI",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "aliases": [
+        {
+          "names": [
+            "Noto Sans Bengali UI",
+            "Noto Sans Devanagari UI",
+            "Noto Sans Gujarati UI",
+            "Noto Sans Malayalam UI",
+            "Noto Sans Tamil UI",
+            "Noto Sans Thai UI"
+          ],
+          "$comment": "There are 63 languages written using Devanagari, and we can't reasonably list them on every Devanagari file. Instead, we need to support script tags (und-Deva) in `languages`."
+        }
+      ],
+      "assets": [
+        {
+          "file_name": "NotoSansBengaliUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "NotoSansDevanagariUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "NotoSansGujaratiUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "NotoSansMalayalamUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "NotoSansTamilUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "NotoSansThaiUI-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "TODO(kpozin): Move into Noto Serif, add aliases",
       "name": "Noto Serif CJK",
       "aliases": [
         {
@@ -944,44 +1157,277 @@
               "weight": 600
             }
           ]
-        },
+        }
+      ]
+    },
+    {
+      "$comment": "Used for CaptionFontFamily.Cursive",
+      "name": "Quintessential",
+      "fallback": true,
+      "generic_family": "cursive",
+      "assets": [
         {
-          "file_name": "NotoSerifCJK-Thin.ttc",
+          "file_name": "Quintessential-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Roboto",
+      "fallback": true,
+      "generic_family": "sans-serif",
+      "aliases": [
+        {
+          "names": [
+            "Roboto Condensed"
+          ],
+          "width": "condensed"
+        }
+      ],
+      "assets": [
+        {
+          "file_name": "Roboto-BlackItalic.ttf",
           "typefaces": [
             {
-              "index": 0,
-              "languages": [
-                "ja"
-              ],
-              "weight": 100
-            },
+              "slant": "italic",
+              "weight": 900
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Black.ttf",
+          "typefaces": [
             {
-              "index": 1,
-              "languages": [
-                "ko"
-              ],
-              "weight": 100
-            },
+              "weight": 900
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-BoldItalic.ttf",
+          "typefaces": [
             {
-              "index": 2,
-              "languages": [
-                "zh-Hans"
-              ],
-              "weight": 100
-            },
+              "slant": "italic",
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Bold.ttf",
+          "typefaces": [
             {
-              "index": 3,
-              "languages": [
-                "zh-Hant",
-                "zh-Bopo"
-              ],
-              "weight": 100
-            },
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Italic.ttf",
+          "typefaces": [
             {
-              "index": 4,
-              "languages": [
-                "zh-HK"
-              ],
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-LightItalic.ttf",
+          "typefaces": [
+            {
+              "slant": "italic",
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Light.ttf",
+          "typefaces": [
+            {
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-MediumItalic.ttf",
+          "typefaces": [
+            {
+              "slant": "italic",
+              "weight": 500
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Medium.ttf",
+          "typefaces": [
+            {
+              "weight": 500
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Regular.ttf",
+          "typefaces": [
+            {
+              "weight": 400
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-ThinItalic.ttf",
+          "typefaces": [
+            {
+              "slant": "italic",
+              "weight": 100
+            }
+          ]
+        },
+        {
+          "file_name": "Roboto-Thin.ttf",
+          "typefaces": [
+            {
+              "weight": 100
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-BoldItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "width": "condensed",
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-Bold.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "width": "condensed"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-Italic.ttf",
+          "typefaces": [
+            {
+              "width": "condensed",
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-LightItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "width": "condensed",
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-Light.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "width": "condensed"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoCondensed-Regular.ttf",
+          "typefaces": [
+            {
+              "width": "condensed"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Roboto Mono",
+      "fallback": true,
+      "generic_family": "monospace",
+      "assets": [
+        {
+          "file_name": "RobotoMono-BoldItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Bold.ttf",
+          "typefaces": [
+            {
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Italic.ttf",
+          "typefaces": [
+            {
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-LightItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 300,
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Light.ttf",
+          "typefaces": [
+            {
+              "weight": 300
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-MediumItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 500,
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Medium.ttf",
+          "typefaces": [
+            {
+              "weight": 500
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
+        },
+        {
+          "file_name": "RobotoMono-ThinItalic.ttf",
+          "typefaces": [
+            {
+              "weight": 100,
+              "slant": "italic"
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoMono-Thin.ttf",
+          "typefaces": [
+            {
               "weight": 100
             }
           ]
@@ -989,152 +1435,56 @@
       ]
     },
     {
-      "name": "Noto Sans Mono CJK",
-      "aliases": [
-        {
-          "names": [
-            "Noto Mono CJK",
-            "Noto CJK Mono"
-          ]
-        },
-        {
-          "names": [
-            "Noto Sans Mono CJK HK",
-            "Noto Sans Mono HK",
-            "Noto Mono CJK HK",
-            "Noto Mono HK"
-          ],
-          "languages": [
-            "zh-HK"
-          ]
-        },
-        {
-          "names": [
-            "Noto Sans Mono CJK JP",
-            "Noto Sans Mono JP",
-            "Noto Mono CJK JP",
-            "Noto Mono JP"
-          ],
-          "languages": [
-            "ja"
-          ]
-        },
-        {
-          "names": [
-            "Noto Sans Mono CJK KR",
-            "Noto Sans Mono KR",
-            "Noto Mono CJK KR",
-            "Noto Mono KR"
-          ],
-          "languages": [
-            "ko"
-          ]
-        },
-        {
-          "names": [
-            "Noto Sans Mono CJK SC",
-            "Noto Sans Mono SC",
-            "Noto Mono CJK SC",
-            "Noto Mono SC"
-          ],
-          "languages": [
-            "zh-Hans"
-          ]
-        },
-        {
-          "names": [
-            "Noto Sans Mono CJK TC",
-            "Noto Sans Mono TC",
-            "Noto Mono CJK TC",
-            "Noto Mono TC"
-          ],
-          "languages": [
-            "zh-Hant",
-            "zh-Bopo"
-          ]
-        }
-      ],
+      "name": "Roboto Slab",
       "fallback": true,
-      "generic_family": "monospace",
+      "generic_family": "serif",
       "assets": [
         {
-          "file_name": "NotoSansCJK-Bold.ttc",
+          "file_name": "RobotoSlab-Bold.ttf",
           "typefaces": [
             {
-              "index": 5,
-              "languages": [
-                "ja"
-              ],
-              "weight": 700
-            },
-            {
-              "index": 6,
-              "languages": [
-                "ko"
-              ],
-              "weight": 700
-            },
-            {
-              "index": 7,
-              "languages": [
-                "zh-Hans"
-              ],
-              "weight": 700
-            },
-            {
-              "index": 8,
-              "languages": [
-                "zh-Hant",
-                "zh-Bopo"
-              ],
-              "weight": 700
-            },
-            {
-              "index": 9,
-              "languages": [
-                "zh-HK"
-              ],
               "weight": 700
             }
           ]
         },
         {
-          "file_name": "NotoSansCJK-Regular.ttc",
+          "file_name": "RobotoSlab-Light.ttf",
           "typefaces": [
             {
-              "index": 5,
-              "languages": [
-                "ja"
-              ]
-            },
-            {
-              "index": 6,
-              "languages": [
-                "ko"
-              ]
-            },
-            {
-              "index": 7,
-              "languages": [
-                "zh-Hans"
-              ]
-            },
-            {
-              "index": 8,
-              "languages": [
-                "zh-Hant",
-                "zh-Bopo"
-              ]
-            },
-            {
-              "index": 9,
-              "languages": [
-                "zh-HK"
-              ]
+              "weight": 300
             }
           ]
+        },
+        {
+          "file_name": "RobotoSlab-Regular.ttf",
+          "typefaces": [
+            {
+              "weight": 400
+            }
+          ]
+        },
+        {
+          "file_name": "RobotoSlab-Thin.ttf",
+          "typefaces": [
+            {
+              "weight": 100
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "$comment": "Used for CaptionFontFamily.Casual",
+      "name": "Short Stack",
+      "fallback": false,
+      "assets": [
+        {
+          "file_name": "ShortStack-Regular.ttf",
+          "typefaces": [
+            {}
+          ]
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/manifest.xml b/manifest.xml
index 44c2e21..143f53b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -14,6 +14,13 @@
         remote="https://fuchsia.googlesource.com/third_party/github.com/google/fonts"
         remotebranch="upstream/master"
         revision="76d80d204e18c793158aaeb80e524197a333a68a"/>
+    <!-- Last revision prior to deletion of Droid fonts -->
+    <project
+        name="github.com/google/fonts-with-droid"
+        path="github.com/google/fonts-with-droid"
+        remote="https://fuchsia.googlesource.com/third_party/github.com/google/fonts"
+        remotebranch="upstream/master"
+        revision="5fb32282c5969930c4268483ffa5664680bf73c8"/>
     <project
         name="github.com/google/material-design-icons"
         path="github.com/google/material-design-icons"
@@ -26,5 +33,17 @@
         remote="https://fuchsia.googlesource.com/third_party/github.com/googlefonts/noto-cjk"
         remotebranch="upstream/master"
         revision="be6c059ac1587e556e2412b27f5155c8eb3ddbe6"/>
+    <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="upstream/master"
+        revision="018aa149d622a4fea11f01c61a7207079da301bc"/>
+    <project
+        name="github.com/googlefonts/noto-fonts"
+        path="github.com/googlefonts/noto-fonts"
+        remote="https://fuchsia.googlesource.com/third_party/github.com/googlefonts/noto-fonts"
+        remotebranch="upstream/master"
+        revision="9485798f121a42d33b13d03ac0883ea4173c3d95"/>
   </projects>
 </manifest>