Merge "mkbootimg: use int for os_version and os_patch_level" into nyc-dev