Merge back ACPICA material for v4.13.