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

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

Change-Id: Ic6f5008f010cc24cf7d78c3955ec6d535212e98b