Merge "Revert "Add img2simg tool that splits a large image into <n> sparse files""