Merge back ACPICA material for 4.19.