Merge "mkbootimg: add os_version" am: 9fc2cd20a6
am: 8b69be8fdc

* commit '8b69be8fdce48c5f1558f27dbdfc12343821123e':
  mkbootimg: add os_version