Merge "Update ImageGenerator to match the latest font names." am: 2fb99930fc am: 4de32b2fb2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6748c3e0ec2029300e8be95f91aae453b43f0902