Merge "Device-specific kernel headers are accessbile again"