Merge "liblog: fortify event_log_tags test" am: de07029ad0
am: 27123d52fc

Change-Id: I42951a35b50f6698be12c3d9a68c28da32d2e01c