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

Change-Id: If8dd9a34ad92a8d951332376273735573ea8a4c6