Merge back earlier ACPICA changes for 4.21.