Merge "Revert "mkbootimg: add version and patch level"" am: 4d25e6664f
am: b9cc3a4110

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