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

* commit '8381c8dd353cd393e0acbe3729f657fc7f679cd4':
  mkbootimg: add version and patch level