Merge "Add img2simg in host and ota packages" into mnc-dev