am 8979cfe1: Merge "Keep the kernel header scrubber\'s data structures in sync."

* commit '8979cfe14b619743dba0625a62abd2e2834434dc':
  Keep the kernel header scrubber's data structures in sync.