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

* commit '1338dc40caf73f1c3f507c001078465571bacae7':
  Revert "mkbootimg: add version and patch level"