Merge "mkbootimg: add version and patch level"