am f46dda96: am 4d2c1ee1: Merge "mkbootimg: misc typo fixes"

* commit 'f46dda96650a7d3e3791a6f4c034ce4d9f9e3f36':
  mkbootimg: misc typo fixes