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

Change-Id: I2f1a8745bf9a350006fe042fa74ecaaf3ef1abf1