am 0b0387c9: Merge "Fix kernel header scrubbing for LP64."

* commit '0b0387c965894e235b72fa965191bf346270135d':
  Fix kernel header scrubbing for LP64.