am 503cd1fa: am c66807f0: am b8e4e0a7: Merge "mkbootimg: use fixed-size types for image format"

* commit '503cd1fa270caa50bf6eec4a56a164ea23e00025':
  mkbootimg: use fixed-size types for image format