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