Merge "mkbootimg: add os_version"