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

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