Merge "mkbootimg: use int for os_version and os_patch_level" am: adbe06d
am: e4052d2

* commit 'e4052d2ca544d47e104f4ff842a013429463420d':
  mkbootimg: use int for os_version and os_patch_level

Change-Id: I61c57e45900da7dbdb303565ed5219f19b1e10b1