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

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

Change-Id: I56cee9e16544a0603544f143a204cb1bf3d53275