Merge AOSP 26e01bbdc5cb ("Populate recovery DTBO offset correctly") Change-Id: Icfc8957b5101d86a1c70bd9c6676824aaaeb75e4 Signed-off-by: Tao Huang <huangtao@rock-chips.com>
From AOSP 294eb9dac3c0 ("mkbootimg: use int for os_version and os_patch_level") Change-Id: I5026049859df121d0a034085c2563cfc4ef98230 Signed-off-by: Tao Huang <huangtao@rock-chips.com>