Merge "Fix dependencies around tools/*-event-log-tags.py"