Merge "Revert "Update ImageGenerator to match the latest font names.""

    private static final Map<String, String> LANGUAGE_TO_FONT_MAP =

            new TreeMap<String, String>() {

                {

                    put("am", "NotoSansEthiopic");

                    put("ar", "NotoNaskhArabicUI");

                    put("am", "NotoSansEthiopic-Regular");

                    put("ar", "NotoNaskhArabicUI-Regular");

                    put("as", "NotoSansBengaliUI-Regular");

                    put("bn", "NotoSansBengaliUI-Regular");

                    put("fa", "NotoNaskhArabicUI");

                    put("gu", "NotoSansGujaratiUI");

                    put("fa", "NotoNaskhArabicUI-Regular");

                    put("gu", "NotoSansGujaratiUI-Regular");

                    put("hi", "NotoSansDevanagariUI-Regular");

                    put("hy", "NotoSansArmenian-Regular");

                    put("iw", "NotoSansHebrew");

                    put("ja", "NotoSansCJKjp-Regular");

                    put("ka", "NotoSansGeorgian-Regular");

                    put("ko", "NotoSansCJKjp-Regular");

                    put("km", "NotoSansKhmerUI");

                    put("kn", "NotoSansKannadaUI");

                    put("lo", "NotoSansLaoUI");

                    put("iw", "NotoSansHebrew-Regular");

                    put("ja", "NotoSansCJK-Regular");

                    put("ka", "NotoSansGeorgian-VF");

                    put("ko", "NotoSansCJK-Regular");

                    put("km", "NotoSansKhmerUI-Regular");

                    put("kn", "NotoSansKannadaUI-Regular");

                    put("lo", "NotoSansLaoUI-Regular");

                    put("ml", "NotoSansMalayalamUI-Regular");

                    put("mr", "NotoSansDevanagariUI-Regular");

                    put("my", "NotoSansMyanmarUI-Regular");

                    put("ne", "NotoSansDevanagariUI-Regular");

                    put("or", "NotoSansOriya");

                    put("pa", "NotoSansGurmukhiUI");

                    put("or", "NotoSansOriya-Regular");

                    put("pa", "NotoSansGurmukhiUI-Regular");

                    put("si", "NotoSansSinhala-Regular");

                    put("ta", "NotoSansTamilUI-Regular");

                    put("te", "NotoSansTeluguUI");

                    put("th", "NotoSansThaiUI");

                    put("ur", "NotoNaskhArabicUI");

                    put("zh", "NotoSansCJKjp-Regular");

                    put("te", "NotoSansTeluguUI-Regular");

                    put("th", "NotoSansThaiUI-Regular");

                    put("ur", "NotoNaskhArabicUI-Regular");

                    put("zh", "NotoSansCJK-Regular");

                }

            };

        }

        String fontName = LANGUAGE_TO_FONT_MAP.getOrDefault(language, DEFAULT_FONT_NAME);

        String[] suffixes = {".otf", ".ttf", ".ttc", ".otc"};

        String[] suffixes = {".otf", ".ttf", ".ttc"};

        for (String suffix : suffixes) {

            File fontFile = new File(mFontDirPath, fontName + suffix);

            if (fontFile.isFile()) {