Merge "Revert "mkbootimg: add version and patch level"" into nyc-dev am: 1338dc40ca
am: 9c423a900b

* commit '9c423a900bddaace21c55f266b0c4843fc9659fa':
  Revert "mkbootimg: add version and patch level"