Merge "ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img"