Merge "stop exporting kernel headers"