Merge "More kernel header updates."