Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files"