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

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