am 6f79df6c: resolved conflicts for merge of af094912 to mnc-dev-plus-aosp
am 6f79df6c: resolved conflicts for merge of af094912 to mnc-dev-plus-aosp

* commit '6f79df6ced19d603819c3623df12acab06135c29':
  Add img2simg in host and ota packages

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build