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

* commit 'fc50845e7d921763152753b60417ece57158cf2e':
  Fix kernel header scrubbing for LP64.