Merge "Update for v5.4 kernel headers." am: 2f9e75b87d am: ffe96dbe0c

Change-Id: Iccda6dc7bb39dd7f9967e2f46f90756d98a81129