Merge "Add headers for new kernel drivers"