Merge back earlier ACPICA material for v4.18.