Merge "fix: device_kernel_headers can't be found in the make world"