Merge "Generate care_map.txt when AVB is enabled" am: 65b98cd3b1
am: 1e0b14eb33

Change-Id: I08cbb2e92028131511a9740aa50c4ddaf3f9fd95