Merge "Fix kernel header scrubbing for LP64."