Merge "img2simg: Add support for converting holes to "don't care" chunks"