Merge "Fix duplicate 'META/care_map.txt' when calling add_img_to_target_files"
am: 463c25f890

Change-Id: I926f8cb59b82310f0ace991ac62eacdf47369d3a