Merge "liblog: switch event_tag_map.c to event_tag_map.cpp" am: 48dfc220cb am: 18f2b9f4c0 am: b8de7b404a
am: dd1b606a51

Change-Id: I30f41b33c4ac0c18eab76ed59ca21632f8420ec9