Merge "mkbootimg: add version and patch level" am: 5417aa0cf5
am: 181f429f0f

* commit '181f429f0f89b5d9936c5b2205f59fee0e4fe034':
  mkbootimg: add version and patch level