Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba
am: bf5e3d168d

Change-Id: I6476c710a220e2fe91dd06203ee418665ebd1a37