Merge "Remove some old kernel header cruft not needed with uapi."