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

Change-Id: I715b9f79570412b93e32cac5e6904427d9917089