Merge "Update for v5.4 kernel headers."