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

Change-Id: I7f6c4109d36113cbda140619c148a46a09768d37