Merge "mkbootimg: misc typo fixes"