Merge "liblog: event_tag_map benchmark" am: 4afb3ef952 am: 6b4a2ec603
am: 966b078715

Change-Id: Ib56cbd7b060484cfe56d65cc425a4109ef3ffd31