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

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

Change-Id: I83c80725f82f080c09e2846b8c51647b9081d8ef