am 914811a9: Merge "Add img2simg in host and ota packages" into mnc-dev

* commit '914811a9f283ed3d8aa826abddf8c11f6167dc14':
  Add img2simg in host and ota packages