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

Change-Id: I896d3fe4bff55a4f2864e1b012ba98441d98f9dc