[automerger skipped] Merge "Revert "Update ImageGenerator to match the latest...

[automerger skipped] Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd833 am: 4810c99f am: 20c3f60a -s ours am: e807efd1 -s ours

am skip reason: skip tag Change-Id I4499dafa3bb3bfcbb8a97dcfd5b4593db467fbd3 with SHA-1 8929f899 is already in history

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1660606

Change-Id: Ica8ab6d265a06b79c95d215a691dd12125adf251