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

Change-Id: I30f8cdf3309d05ae76389a8406dc83a0c0823438