Merge "mkbootimg: add os_version"
am: 9fc2cd20a6

* commit '9fc2cd20a615a03b0375769939ba0dc1a946f4ac':
  mkbootimg: add os_version