Merge back ACPICA changes for v4.12.