Merge "Update for new kernel headers."