Merge "Remove unused cruft from <log/log.h>."
am: 6acf7663c2

* commit '6acf7663c27db80eac9a9156916dc39edee71c33':
  Remove unused cruft from <log/log.h>.