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

Change-Id: I0cdf5e13ec1c291d4dba1bf06f7df538c8389f53