Merge "Remove unused cruft from <log/log.h>."