Merge "Remove simg2img from user_tags.mk"