Merge back earlier ACPICA changes for v4.11.