Merge "Revert "Update ImageGenerator to match the latest font names."" am: 853dd83390

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

Change-Id: Ib1a6d554c29ca3d8fb227c7a153bf810373e9922