Merge "Remove a dependency on a device-kernel-specific header."